2 files changed, 42 insertions, 34 deletions

diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index 2951a610beae..91f287c13408 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	audacity
-PORTVERSION=	2.0.4
+PORTVERSION=	2.0.5
 CATEGORIES=	audio
 MASTER_SITES=	GOOGLE_CODE \
 		SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
@@ -13,13 +13,11 @@ COMMENT=	GUI editor for digital audio waveforms
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
-
 WRKSRC=		${WRKDIR}/${PORTNAME}-src-${PORTVERSION}
 
 USE_AUTOTOOLS=	aclocal autoconf
 GNU_CONFIGURE=	yes
-USES=		gmake gettext pkgconfig
+USES=		desktop-file-utils gmake gettext pkgconfig shared-mime-info
 USE_XZ=		yes
 USE_WX=		2.8
 WX_UNICODE=	yes
@@ -27,17 +25,25 @@ WX_COMPS=	wx
 INSTALLS_ICONS=	yes
 PORTDOCS=	README.txt
 
-OPTIONS_DEFINE=	DOCS FFMPEG FLAC ID3TAG JACK LADSPA MAD NYQUIST PORTMIXER \
-		SAMPLERATE SBSMS SOXR SSE TAGLIB TWOLAME VAMP VORBIS
-OPTIONS_DEFAULT=	FFMPEG FLAC ID3TAG JACK LADSPA MAD NYQUIST \
-			PORTMIXER SAMPLERATE SBSMS SOXR SSE TAGLIB \
-			TWOLAME VAMP VORBIS
-
+OPTIONS_DEFINE=	DEBUG DOCS FFMPEG FLAC ID3TAG LADSPA LAME MAD MIDI NYQUIST \
+		PORTMIXER SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS
+OPTIONS_RADIO=	SAMPLERATED
+OPTIONS_RADIO_SAMPLERATED=	RESAMPLE SAMPLERATE SOXR
+OPTIONS_DEFAULT=	FFMPEG FLAC ID3TAG LADSPA LAME MAD MIDI NYQUIST \
+			PORTMIXER SBSMS SOUNDTOUCH SOXR TWOLAME VAMP VORBIS
+
+DEBUG_DESC=	Enable debug support
+LAME_DESC=	Use lame for import and export support
+MAD_DESC=	Use libmad for mp2/3 decoding support
+MIDI_DESC=	Use portSMF for Midi support
 NYQUIST_DESC=	Nyquist plug-in support
+RESAMPLE_DESC=	Use libresample for sample rate conversion
+SAMPLERATE_DESC=	Use libsamplerate for sample rate conversion
+SAMPLERATED_DESC=	Default sample rate conversion support
 PORTMIXER_DESC=	Compile with PortMixer support
 SBSMS_DESC=	Use libsbsms for pitch and tempo changing
+SOUNDTOUCH_DESC=	Use libSoundTouch for pitch and tempo changing
 SOXR_DESC=	Use libsoxr for sample rate conversion
-SSE=		Enable SSE optimizations
 TAGLIB_DESC=	Use TagLib for metadata support
 TWOLAME_DESC=	Use libtwolame for MP2 export support
 VAMP_DESC=	Vamp plug-in support
@@ -52,6 +58,17 @@ CONFIGURE_ENV+=	WX_CONFIG="${WX_CONFIG}"
 CONFIGURE_ARGS+=	--with-lib-preference="local system" \
 			--with-portaudio --enable-unicode
 
+.if ${MACHINE_CPU:Msse}
+CONFIGURE_ARGS+=	--enable-sse
+.else
+CONFIGURE_ARGS+=	--disable-sse
+.endif
+
+DEBUG_CONFIGURE_WITH=	debug
+
+SNDFILE_CONFIGURE_WITH=	libsndfile
+SNDFILE_LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
+
 FFMPEG_CONFIGURE_WITH=	ffmpeg
 FFMPEG_RUN_DEPENDS=	ffmpeg0:${PORTSDIR}/multimedia/ffmpeg0
 FFMPEG_BUILD_DEPENDS=	ffmpeg0>=0:${PORTSDIR}/multimedia/ffmpeg0
@@ -65,7 +82,6 @@ FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
 ID3TAG_CONFIGURE_WITH=	libid3tag
 ID3TAG_LIB_DEPENDS=	libid3tag.so:${PORTSDIR}/audio/libid3tag
 
-JACK_CONFIGURE_WITH=	jack
 JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
 
 LADSPA_CONFIGURE_ENABLE=	ladspa
@@ -74,16 +90,24 @@ LADSPA_RUN_DEPENDS=	listplugins:${PORTSDIR}/audio/ladspa
 MAD_CONFIGURE_WITH=	libmad
 MAD_LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad
 
+MIDI_CONFIGURE_WITH=	midi
+
+LAME_CONFIGURE_WITH=	lame
+LAME_LIB_DEPENDS=	libmp3lame.so:${PORTSDIR}/audio/lame
+
 NYQUIST_CONFIGURE_ENABLE=	nyquist
 
 PORTMIXER_CONFIGURE_WITH=	portmixer
 
+RESAMPLE_CONFIGURE_WITH=	libresample
+
 SAMPLERATE_CONFIGURE_WITH=	libsamplerate
 SAMPLERATE_LIB_DEPENDS=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate
 
 SBSMS_CONFIGURE_WITH=	sbsms
 
-SSE_CONFIGURE_WITH=	sse
+SOUNDTOUCH_CONFIGURE_WITH=	soundtouch
+SOUNDTOUCH_LIB_DEPENDS=	libSoundTouch.so:${PORTSDIR}/audio/soundtouch
 
 SOXR_CONFIGURE_WITH=	libsoxr
 SOXR_BUILD_DEPENDS=	cmake:${PORTSDIR}/devel/cmake
@@ -91,9 +115,6 @@ SOXR_BUILD_DEPENDS=	cmake:${PORTSDIR}/devel/cmake
 TWOLAME_CONFIGURE_WITH=	libtwolame
 TWOLAME_LIB_DEPENDS=	libtwolame.so:${PORTSDIR}/audio/twolame
 
-TAGLIB_CONFIGURE_WITH=	taglib
-TAGLIB_LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib
-
 VAMP_CONFIGURE_WITH=	libvamp
 
 VORBIS_CONFIGURE_WITH=	libvorbis
@@ -102,33 +123,20 @@ VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
 .include <bsd.port.pre.mk>
 
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CPPFLAGS+=	-I${WRKSRC}/lib-src/portsmf -I${WRKSRC}/lib-src/portaudio-v19/include -I${LOCALBASE}/include ${SSE_CFLAGS} ${PTHREAD_CFLAGS}
-CXXFLAGS+=	-I${WRKSRC}/lib-src/portsmf -I${WRKSRC}/lib-src/portaudio-v19/include -I${LOCALBASE}/include ${SSE_CFLAGS} ${PTHREAD_CFLAGS}
-CFLAGS+=	-I${WRKSRC}/lib-src/portsmf -I${WRKSRC}/lib-src/portaudio-v19/include -I${LOCALBASE}/include ${SSE_CFLAGS} ${PTHREAD_CFLAGS}
-
-.if ${ARCH} != "amd64"
-SSE_CFLAGS=	-mno-sse -mno-sse2
-.endif
+CPPFLAGS+=	-I${WRKSRC}/lib-src/portsmf -I${WRKSRC}/lib-src/portaudio-v19/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+CXXFLAGS+=	-I${WRKSRC}/lib-src/portsmf -I${WRKSRC}/lib-src/portaudio-v19/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+CFLAGS+=	-I${WRKSRC}/lib-src/portsmf -I${WRKSRC}/lib-src/portaudio-v19/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 
 post-patch:
 #audacity links to some dependencies if present, even if explicitly disabled.
 #these must be patched out for the case when they are installed but
 #option-disabled to avoid unrecorded dependencies.
 
-.if empty(PORT_OPTIONS:MJACK)
-	@${REINPLACE_CMD} -e 's|PKG_CHECK_MODULES(JACK, jack, have_jack=yes, have_jack=no)|have_jack=no|' ${WRKSRC}/configure.in
-.endif
-
 .if empty(PORT_OPTIONS:MSAMPLERATE)
 	@${REINPLACE_CMD} -e 's|libresample.a -lsamplerate $(LIBS)|libresample.a $(LIBS)|' ${WRKSRC}/lib-src/libresample/Makefile.in
 .endif
 
 	@${REINPLACE_CMD} -e 's|inline void|static inline void|' ${WRKSRC}/lib-src/libnyquist/nyquist/ffts/src/fftlib.c
-	@${REINPLACE_CMD} \
-		-e 's|libavcodec |libavcodec0 |g' \
-		-e 's|libavformat |libavformat0 |g' \
-		-e 's|libavutil,|libavutil0,|g' \
-		${WRKSRC}/m4/audacity_checklib_ffmpeg.m4
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/audio/audacity/distinfo b/audio/audacity/distinfo
index e08282bdb756..a7c5d8a9aa11 100644
--- a/audio/audacity/distinfo
+++ b/audio/audacity/distinfo
@@ -1,2 +1,2 @@
-SHA256 (audacity-minsrc-2.0.4.tar.xz) = 772ba2336fc3f2c7b6e0dfa927b91143c987db14201e7bc523fa4f4fa313895e
-SIZE (audacity-minsrc-2.0.4.tar.xz) = 5331376
+SHA256 (audacity-minsrc-2.0.5.tar.xz) = e287541dd017f523fd9a06d5140b8f72fe9a0450709de7c398baffa106db2b79
+SIZE (audacity-minsrc-2.0.5.tar.xz) = 5314060