audacity: shuffle code around

audio/audacity/Portfile

@@ -95,20 +95,20 @@ depends_build-append \
                     port:cmake \
                     port:pkgconfig \
                     port:python27
-depends_lib-append  port:expat \
-                    path:lib/libavcodec.dylib:ffmpeg \
-                    port:flac \
-                    port:freetype \
+depends_lib-append  port:freetype \
                     port:harfbuzz \
-                    port:lame \
                     port:libid3tag \
                     port:libmad \
-                    port:libogg \
-                    port:libsndfile \
-                    port:libvorbis \
                     port:soundtouch \
                     port:soxr \
-                    port:twolame
+                    port:twolame \
+                    port:expat \
+                    path:lib/libavcodec.dylib:ffmpeg \
+                    port:flac \
+                    port:lame \
+                    port:libogg \
+                    port:libsndfile \
+                    port:libvorbis
 # audacity could use port:lv2 and port:lilv but would also require a port:suil for that to be possible.
 
 patch.pre_args      -Np1
@@ -150,6 +150,47 @@ if {[variant_exists wx32] && [variant_isset wx32]} {
                     ${PPREFIX}patch-wxw-31x.diff
 }
 
+# quelch a huge number of warnings
+configure.cxxflags-append \
+                    -Wno-inconsistent-missing-override \
+                    -Wno-overloaded-virtual
+
+configure.args-append \
+                    --disable-dependency-tracking \
+                    --disable-quicktime \
+                    --disable-static \
+                    --disable-universal_binary \
+                    --enable-audiounits \
+                    --enable-shared \
+                    --enable-sse \
+                    --with-ffmpeg \
+                    --with-lame \
+                    --with-libflac \
+                    --with-libmad \
+                    --with-libsoxr \
+                    --with-libvamp=local \
+                    --with-libvorbis \
+                    --with-lv2=local \
+                    --with-portmixer \
+                    --with-sbsms=local \
+                    --with-soundtouch \
+                    --with-twolame \
+                    --with-widgetextra=local \
+                    --with-portmidi=system \
+                    CPPFLAGS=-I${prefix}/include \
+                    WX_CONFIG=${wxWidgets.wxconfig}
+
+# Since version 2.2.0 we need to use the embedded (modified) Portaudio version.
+configure.args-append \
+                    --with-portaudio=local
+configure.env-append \
+                    PORTMIDI_CFLAGS=-I${prefix}/include \
+                    PORTMIDI_LIBS=${prefix}/lib/libportmidi.dylib
+depends_lib-append \
+                    port:portmidi
+
+build.args-append   V=1 VERBOSE=1
+
 post-patch {
     set python_bin ${prefix}/bin/python2.7
     reinplace -W ${worksrcpath} "s|@@PYTHON@@|${python_bin}|g" \
@@ -195,47 +236,6 @@ post-patch {
     }
 }
 
-# quelch a huge number of warnings
-configure.cxxflags-append \
-                    -Wno-inconsistent-missing-override \
-                    -Wno-overloaded-virtual
-
-configure.args-append \
-                    --disable-dependency-tracking \
-                    --disable-quicktime \
-                    --disable-static \
-                    --disable-universal_binary \
-                    --enable-audiounits \
-                    --enable-shared \
-                    --enable-sse \
-                    --with-ffmpeg \
-                    --with-lame \
-                    --with-libflac \
-                    --with-libmad \
-                    --with-libsoxr \
-                    --with-libvamp=local \
-                    --with-libvorbis \
-                    --with-lv2=local \
-                    --with-portmixer \
-                    --with-sbsms=local \
-                    --with-soundtouch \
-                    --with-twolame \
-                    --with-widgetextra=local \
-                    --with-portmidi=system \
-                    CPPFLAGS=-I${prefix}/include \
-                    WX_CONFIG=${wxWidgets.wxconfig}
-
-# Since version 2.2.0 we need to use the embedded (modified) Portaudio version.
-configure.args-append \
-                    --with-portaudio=local
-configure.env-append \
-                    PORTMIDI_CFLAGS=-I${prefix}/include \
-                    PORTMIDI_LIBS=${prefix}/lib/libportmidi.dylib
-depends_lib-append \
-                    port:portmidi
-
-build.args-append   V=1 VERBOSE=1
-
 platform darwin {
     set aud_app_path    ${applications_dir}/Audacity.app
     destroot.keepdirs   ${destroot}${aud_app_path}/Contents/Resources/en.lproj

audio/audacity/files/devel/patch-unordered_map-fixes.diff

@@ -15,7 +15,7 @@ diff --git a/src/commands/CommandManager.h b/src/commands/CommandManager.h
 index 7668506f2698240a1efbace1521401040a7396e4..7fae64ec06a48ce4ae7b77c2489a17ed0e2d89da 100644
 --- a/src/commands/CommandManager.h
 +++ b/src/commands/CommandManager.h
-@@ -101,7 +101,7 @@ namespace std
+@@ -104,7 +104,7 @@ namespace std
     namespace tr1
     {
  #endif

audio/audacity/files/patch-unordered_map-fixes.diff

@@ -2,7 +2,7 @@ diff --git a/src/MemoryX.h b/src/MemoryX.h
 index 56e99171a9eb87fe574291d0ec9d086efb0c1fbb..621afa3001ba354f36e80edb86c72a45dca426cb 100644
 --- a/src/MemoryX.h
 +++ b/src/MemoryX.h
-@@ -1177,7 +1179,7 @@ namespace std
+@@ -1171,7 +1173,7 @@ namespace std
     namespace tr1
     {
  #endif