3 files changed, 52 insertions, 26 deletions

diff --git a/audio/audacity-devel/Makefile b/audio/audacity-devel/Makefile
index b3ff8c7ccb79..cbe1178321a7 100644
--- a/audio/audacity-devel/Makefile
+++ b/audio/audacity-devel/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	audacity
-PORTVERSION=	1.3.13
-PORTREVISION=	1
+PORTVERSION=	1.3.14
 CATEGORIES=	audio
 MASTER_SITES=	GOOGLE_CODE \
 		SF/${PORTNAME}/${PORTNAME}-unstable/${PORTVERSION}
@@ -16,7 +15,8 @@ DISTNAME=	${PORTNAME}-minsrc-${PORTVERSION}-beta
 MAINTAINER=	xxjack12xx@gmail.com
 COMMENT=	Audacity is a GUI editor for digital audio waveforms
 
-LIB_DEPENDS=	sndfile.1:${PORTSDIR}/audio/libsndfile
+LIB_DEPENDS=	jack:${PORTSDIR}/audio/jack \
+		sndfile.1:${PORTSDIR}/audio/libsndfile
 
 CONFLICTS=	audacity-[0-9]*
 
@@ -28,19 +28,18 @@ USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_BZIP2=	yes
 USE_WX=		2.8
+WX_UNICODE=	yes
 WX_COMPS=	wx
+INSTALLS_ICONS=	yes
 MAKE_JOBS_SAFE=	yes
-PORTDOCS=	README.txt LICENSE.txt
 MAN1=		audacity.1
 MANCOMPRESSED=	yes
 
-OPTIONS=	DEBUG		"Debug support" off \
-		FFMPEG		"Use ffmpeg for import and export support" on \
+OPTIONS=	FFMPEG		"Use ffmpeg for import and export support" on \
 		FLAC		"Use libFLAC for FLAC support" on \
 		ID3TAG		"Use libid3tag for mp3 id3 tag support" on \
 		LADSPA		"LADSPA plug-in support" on \
 		MAD		"Use libmad for mp2/3 decoding support"	on \
-		MIDI		"Use portSMF for Midi support" on \
 		NYQUIST		"Nyquist plug-in support" on \
 		PORTMIXER	"Compile with PortMixer" on \
 		SAMPLERATE	"Use libresample for sample rate conversion" on \
@@ -48,7 +47,6 @@ OPTIONS=	DEBUG		"Debug support" off \
 		SOUNDTOUCH 	"Use libSoundTouch for pitch and tempo changing" on\
 		TAGLIB		"Use TagLib for metadata support" on \
 		TWOLAME		"Use libtwolame for MP2 export support" on \
-		UNICODE		"Unicode support" on \
 		VORBIS		"Use libvorbis for Ogg Vorbis support"	on \
 		VAMP		"Use libvamp for Vamp plug-in support" on
 
@@ -75,73 +73,95 @@ MAKE_ENV=	DOC=yes
 
 CONFIGURE_ARGS+=	--with-lib-preference="local system"
 CONFIGURE_ARGS+=	--with-portaudio
-.if defined(WITH_DEBUG)
-CONFIGURE_ARGS+=	--enable-debug
-.endif
+CONFIGURE_ARGS+=	--enable-unicode
 
 .if defined(WITH_FFMPEG)
 CONFIGURE_ARGS+=	--with-ffmpeg
+.else
+CONFIGURE_ARGS+=	--without-ffmpeg
 .endif
 
 .if defined(WITH_FLAC)
 CONFIGURE_ARGS+=	--with-libflac
+.else
+CONFIGURE_ARGS+=	--without-libflac
 .endif
 
 .if defined(WITH_ID3TAG)
+LIB_DEPENDS+=		id3tag:${PORTSDIR}/audio/libid3tag
 CONFIGURE_ARGS+=	--with-libid3tag
+.else
+CONFIGURE_ARGS+=	--without-libid3tag
 .endif
 
 .if defined(WITH_LADSPA)
 CONFIGURE_ARGS+=	--enable-ladspa
+.else
+CONFIGURE_ARGS+=	--disable-ladspa
 .endif
 
 .if defined(WITH_MAD)
+LIB_DEPENDS+=		mad.2:${PORTSDIR}/audio/libmad
 CONFIGURE_ARGS+=	--with-libmad
-.endif
-
-.if defined(WITH_MIDI)
-CONFIGURE_ARGS+=	--with-midi
+.else
+CONFIGURE_ARGS+=	--without-libmad
 .endif
 
 .if defined(WITH_NYQUIST)
 CONFIGURE_ARGS+=	--enable-nyquist
+.else
+CONFIGURE_ARGS+=	--disable-nyquist
 .endif
 
 .if defined(WITH_PORTMIXER)
 CONFIGURE_ARGS+=	--with-portmixer
+.else
+CONFIGURE_ARGS+=	--without-portmixer
 .endif
 
 .if defined(WITH_SAMPLERATE)
 CONFIGURE_ARGS+=	--with-libresample
+.else
+CONFIGURE_ARGS+=	--without-libresample
 .endif
 
 .if defined(WITH_SBSMS)
 CONFIGURE_ARGS+=	--with-sbsms
+.else
+CONFIGURE_ARGS+=	--without-sbsms
 .endif
 
 .if defined(WITH_SOUNDTOUCH)
+LIB_DEPENDS+=		SoundTouch:${PORTSDIR}/audio/soundtouch
 CONFIGURE_ARGS+=	--with-soundtouch
+.else
+CONFIGURE_ARGS+=	--without-soundtouch
 .endif
 
 .if defined(WITH_TWOLAME)
+LIB_DEPENDS+=		twolame:${PORTSDIR}/audio/twolame
 CONFIGURE_ARGS+=	--with-libtwolame
+.else
+CONFIGURE_ARGS+=	--without-libtwolame
 .endif
 
 .if defined(WITH_TAGLIB)
+LIB_DEPENDS+=		tag:${PORTSDIR}/audio/taglib
 CONFIGURE_ARGS+=	--with-taglib
-.endif
-
-.if defined(WITH_UNICODE)
-WX_UNICODE=	yes
-CONFIGURE_ARGS+=	--enable-unicode
+.else
+CONFIGURE_ARGS+=	--without-taglib
 .endif
 
 .if defined(WITH_VAMP)
 CONFIGURE_ARGS+=	--with-libvamp
+.else
+CONFIGURE_ARGS+=	--without-libvamp
 .endif
 
 .if defined(WITH_VORBIS)
 CONFIGURE_ARGS+=	--with-libvorbis
+.else
+CONFIGURE_ARGS+=	--without-libvorbis
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/audio/audacity-devel/distinfo b/audio/audacity-devel/distinfo
index d7facce353ca..f7d02191e5c9 100644
--- a/audio/audacity-devel/distinfo
+++ b/audio/audacity-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (audacity-minsrc-1.3.13-beta.tar.bz2) = 4c2eda638e16e16dfddd202e86ccbe1d170b04c26cfb2c12ffcba0b79e7e1e83
-SIZE (audacity-minsrc-1.3.13-beta.tar.bz2) = 6450901
+SHA256 (audacity-minsrc-1.3.14-beta.tar.bz2) = 35990403cf078b862e7c839c73e5ef5f6b5160de1e3ccbd846e6153883194ab2
+SIZE (audacity-minsrc-1.3.14-beta.tar.bz2) = 6595572
diff --git a/audio/audacity-devel/pkg-plist b/audio/audacity-devel/pkg-plist
index 5ace3f8dbcc0..20f2812d8318 100644
--- a/audio/audacity-devel/pkg-plist
+++ b/audio/audacity-devel/pkg-plist
@@ -58,6 +58,8 @@ share/applications/audacity.desktop
 %%DATADIR%%/plug-ins/tremolo.ny
 %%DATADIR%%/plug-ins/vocalremover.ny
 %%DATADIR%%/plug-ins/vocoder.ny
+%%PORTDOCS%%share/doc/audacity/LICENSE.txt
+%%PORTDOCS%%share/doc/audacity/README.txt
 share/icons/hicolor/16x16/apps/audacity.png
 share/icons/hicolor/22x22/apps/audacity.png
 share/icons/hicolor/24x24/apps/audacity.png
@@ -106,6 +108,7 @@ share/locale/ro/LC_MESSAGES/audacity.mo
 share/locale/ru/LC_MESSAGES/audacity.mo
 share/locale/sk/LC_MESSAGES/audacity.mo
 share/locale/sl/LC_MESSAGES/audacity.mo
+share/locale/sr_RS/LC_MESSAGES/audacity.mo
 share/locale/sv/LC_MESSAGES/audacity.mo
 share/locale/tg/LC_MESSAGES/audacity.mo
 share/locale/tr/LC_MESSAGES/audacity.mo
@@ -120,6 +123,8 @@ share/pixmaps/audacity32.xpm
 share/pixmaps/gnome-mime-application-x-audacity-project.xpm
 @dirrmtry share/mime/packages
 @dirrmtry share/mime
+@dirrmtry share/locale/sr_RS/LC_MESSAGES
+@dirrmtry share/locale/sr_RS
 @dirrmtry share/locale/oc/LC_MESSAGES
 @dirrmtry share/locale/oc
 @dirrmtry share/locale/my/LC_MESSAGES
@@ -142,8 +147,9 @@ share/pixmaps/gnome-mime-application-x-audacity-project.xpm
 @dirrmtry share/icons/hicolor/16x16
 @dirrmtry share/icons/hicolor
 @dirrmtry share/icons
-@dirrm %%DATADIR%%/plug-ins
-@dirrm %%DATADIR%%/nyquist/rawwaves
-@dirrm %%DATADIR%%/nyquist
-@dirrm share/audacity
+%%PORTDOCS%%@dirrmtry share/doc/audacity
+@dirrmtry %%DATADIR%%/plug-ins
+@dirrmtry %%DATADIR%%/nyquist/rawwaves
+@dirrmtry %%DATADIR%%/nyquist
+@dirrmtry %%DATADIR%%
 @dirrmtry share/applications