From craig@yekse.gank.org  Mon Dec 12 17:43:54 2005
Return-Path: <craig@yekse.gank.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 01F8E16A51A
	for <bug-followup@FreeBSD.org>; Mon, 12 Dec 2005 17:43:54 +0000 (GMT)
	(envelope-from craig@yekse.gank.org)
Received: from ion.gank.org (ion.gank.org [69.55.238.164])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 96BA243D67
	for <bug-followup@FreeBSD.org>; Mon, 12 Dec 2005 17:43:53 +0000 (GMT)
	(envelope-from craig@yekse.gank.org)
Received: by ion.gank.org (mail, from userid 1001)
	id B27E12A91A; Mon, 12 Dec 2005 11:43:52 -0600 (CST)
Message-Id: <20051212174352.GC53120@nowhere>
Date: Mon, 12 Dec 2005 11:43:52 -0600
From: Craig Boston <craig@yekse.gank.org>
To: bug-followup@FreeBSD.org
Subject:

>Number:         90298
>Category:       ports
>Synopsis:       
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 12 17:50:03 GMT 2005
>Closed-Date:    Mon Dec 12 18:26:55 GMT 2005
>Last-Modified:  Mon Dec 12 18:26:55 GMT 2005
>Originator:     
>Release:        
>Organization:
>Environment:
>Description:
 --PNTmBPCT7hxwcZjr
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 Grrr, I didn't see that the 'b' bugfix was posted under a different file
 name.  Please use the attached patch instead.
 
 
 --PNTmBPCT7hxwcZjr
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="audacity-1.2.4b.patch"
 
 diff -ruN audacity.orig/Makefile audacity/Makefile
 --- audacity.orig/Makefile	Tue Nov 15 00:47:50 2005
 +++ audacity/Makefile	Mon Dec 12 11:33:38 2005
 @@ -5,8 +5,7 @@
  # $FreeBSD: ports/audio/audacity/Makefile,v 1.25 2005/11/15 06:47:50 ade Exp $
  
  PORTNAME=	audacity
 -PORTVERSION=	1.2.3
 -PORTREVISION=	2
 +PORTVERSION=	1.2.4b
  CATEGORIES=	audio
  MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
  MASTER_SITE_SUBDIR=	${PORTNAME}
 @@ -16,7 +15,7 @@
  COMMENT=	Audacity is a GUI editor for digital audio waveforms
  
  BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip
 -LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
 +LIB_DEPENDS=	wx_gtk2_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26
  
  WRKSRC=		${WRKDIR}/${PORTNAME}-src-${PORTVERSION}
  GNU_CONFIGURE=	yes
 @@ -24,6 +23,10 @@
  USE_X_PREFIX=	yes
  USE_AUTOTOOLS=	libtool:15
  
 +OPTIONS=	ID3TAG "ID3 tag support" off \
 +		MAD "libmad MP3 support" on \
 +		VORBIS "Ogg Vorbis support" on
 +
  .include <bsd.port.pre.mk>
  
  .if ${ARCH} == "i386" && ${OSVERSION} >= 501103
 @@ -32,8 +35,7 @@
  CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
  		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${SSE_CFLAGS} ${PTHREAD_CFLAGS}" \
  		CFLAGS="${CFLAGS} -I${LOCALBASE}/include ${SSE_CFLAGS} ${PTHREAD_CFLAGS}" \
 -		WX_CONFIG=${X11BASE}/bin/wxgtk2-2.4-config
 -CONFIGURE_ARGS+=	--with-id3=no
 +		WX_CONFIG=${X11BASE}/bin/wxgtk2-2.6-config
  
  .if !defined(NOPORTDOCS)
  MAKE_ENV=	DOC=yes
 @@ -53,12 +55,11 @@
  CONFIGURE_ARGS+=	--without-vorbis
  .endif
  
 -pre-everything::
 -.if !defined(WITHOUT_MAD)
 -	@${ECHO_MSG} "You can disable support for libmad (MP3) by defining WITHOUT_MAD."
 -.endif
 -.if !defined(WITHOUT_VORBIS)
 -	@${ECHO_MSG} "You can disable support for vorbis by defining WITHOUT_VORBIS."
 +.if defined(WITH_ID3TAG)
 +CONFIGURE_ARGS+=	--with-id3tag=system
 +LIB_DEPENDS+=	id3tag.0:${PORTSDIR}/audio/libid3tag
 +.else
 +CONFIGURE_ARGS+=	--without-id3tag
  .endif
  
  MAN1=		audacity.1
 diff -ruN audacity.orig/distinfo audacity/distinfo
 --- audacity.orig/distinfo	Mon Dec  6 14:33:29 2004
 +++ audacity/distinfo	Mon Dec 12 11:33:40 2005
 @@ -1,2 +1,3 @@
 -MD5 (audacity-src-1.2.3.tar.gz) = dbfc1b401420aa694753d35acb5a8a28
 -SIZE (audacity-src-1.2.3.tar.gz) = 4175943
 +MD5 (audacity-src-1.2.4b.tar.gz) = 37df5b6119302f7ab77ca16d25311756
 +SHA256 (audacity-src-1.2.4b.tar.gz) = 7c6f53ceffc10fbff96cc3fdf2a2b61072ed8b527d4f7313b3216390907de113
 +SIZE (audacity-src-1.2.4b.tar.gz) = 4499894
 diff -ruN audacity.orig/pkg-plist audacity/pkg-plist
 --- audacity.orig/pkg-plist	Mon Dec 12 09:49:36 2005
 +++ audacity/pkg-plist	Mon Dec 12 10:00:38 2005
 @@ -17,6 +17,7 @@
  share/audacity/nyquist/system.lsp
  share/audacity/nyquist/test.lsp
  share/audacity/nyquist/xlinit.lsp
 +share/audacity/plug-ins/SilenceMarker.ny
  share/audacity/plug-ins/clicktrack.ny
  share/audacity/plug-ins/crossfadein.ny
  share/audacity/plug-ins/crossfadeout.ny
 @@ -26,17 +27,22 @@
  share/audacity/plug-ins/pluck.ny
  share/audacity/plug-ins/tremolo.ny
  share/audacity/audacity-1.2-help.htb
 +share/locale/ar/LC_MESSAGES/audacity.mo
  share/locale/bg/LC_MESSAGES/audacity.mo
  share/locale/ca/LC_MESSAGES/audacity.mo
  share/locale/cs/LC_MESSAGES/audacity.mo
  share/locale/da/LC_MESSAGES/audacity.mo
  share/locale/de/LC_MESSAGES/audacity.mo
 +share/locale/el/LC_MESSAGES/audacity.mo
  share/locale/es/LC_MESSAGES/audacity.mo
 +share/locale/eu/LC_MESSAGES/audacity.mo
  share/locale/fi/LC_MESSAGES/audacity.mo
  share/locale/fr/LC_MESSAGES/audacity.mo
 +share/locale/ga/LC_MESSAGES/audacity.mo
  share/locale/hu/LC_MESSAGES/audacity.mo
  share/locale/it/LC_MESSAGES/audacity.mo
  share/locale/ja/LC_MESSAGES/audacity.mo
 +share/locale/lt/LC_MESSAGES/audacity.mo
  share/locale/mk/LC_MESSAGES/audacity.mo
  share/locale/nb/LC_MESSAGES/audacity.mo
  share/locale/nl/LC_MESSAGES/audacity.mo
 @@ -47,6 +53,7 @@
  share/locale/sv/LC_MESSAGES/audacity.mo
  share/locale/uk/LC_MESSAGES/audacity.mo
  share/locale/zh/LC_MESSAGES/audacity.mo
 +share/locale/zh_TW/LC_MESSAGES/audacity.mo
  @dirrm share/audacity/plug-ins
  @dirrm share/audacity/nyquist
  @dirrm share/audacity
 
 --PNTmBPCT7hxwcZjr--
>How-To-Repeat:
>Fix:
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: linimon 
State-Changed-When: Mon Dec 12 18:26:12 UTC 2005 
State-Changed-Why:  
Misfiled followup to ports/90294; the information is already there. 


Responsible-Changed-From-To: gnats-admin->freebsd-ports-bugs 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Mon Dec 12 18:26:12 UTC 2005 
Responsible-Changed-Why:  

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