Ticket #56097: audacity.diff

audio/audacity/Portfile

@@ -2 +2 @@
 
 PortSystem          1.0
 
-PortGroup           active_variants 1.1
-PortGroup           cxx11 1.1
 PortGroup           github 1.0
 PortGroup           wxWidgets 1.0
+PortGroup           active_variants 1.1
+
+platform darwin {
+    if {${os.major} < 13} {
+        PortGroup   cxx11 1.1
+    }
+}
 
 name                audacity
 
@@ -22 +27 @@
                     Numerous effects including change the speed or pitch of a recording. \n\
                     And more!
 
-subport audacity-devel {
+subport             audacity-devel {
     long_description A port of the Audacity audio editor aimed at development purposes.
 }
 
 
 if {${subport} eq "${name}"} {
-    conflicts       ${name}-devel
+    conflicts       "${name}-devel"
     # get the source tarball from github because it contains all required external libs
     # incl. those not in MacPorts.
     github.setup    audacity audacity 2.2.2 Audacity-
@@ -37 +42 @@
                     size    25941576
     set PPREFIX     ./
 } else {
-    conflicts       ${name}
-    # git describe --tags : Audacity-2.2.2-336-g49eb7ddb6
-    github.setup    audacity audacity 49eb7ddb61cf7d2d9468932ac340550ef48a8828
-    version         2.2.2.336
+    conflicts       "${name}"
+    # git describe --tags : Audacity-2.2.2-407-g56bca7427
+    github.setup    audacity audacity 56bca7427218ab9bdd9a54f4eb7d7490c07657bb
+    version         2.2.2.407
     # this port is intended to facilitate development efforts shared with "upstreams"
     # so using git instead of a tarball fetch type is more appropriate.
-    fetch.type      git
-    distname        audacity-git
+    # fetch.type      git
+    # distname        audacity-git
+    checksums       rmd160  43b66fdbe873d5f64059f5b58b20b676d9540d20 \
+                    sha256  9231238cfe468b7b0531853564cfc19dea635f50b1acd5c9b468c5795d6e767b
     set PPREFIX     devel/
 
     variant wx32 description {Use wxWidgets 3.2 - experimental!} {}
@@ -92 +99 @@
                     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
@@ -141 +148 @@
                     patch-implement-progdial=beep.diff
     patchfiles-append \
                     patch-temp-fixes.diff
-    if {[variant_exists wx32] && [variant_isset wx32]} {
-        patchfiles-append \
+}
+if {[variant_exists wx32] && [variant_isset wx32]} {
+    patchfiles-append \
                     ${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
+
+# make sure the C++ stdlib argument is added to the LDFLAGS too
+if {${configure.cxx_stdlib} ne "" && [string match *clang* ${configure.cxx}]} {
+    configure.ldflags-append \
+                    -stdlib=${configure.cxx_stdlib}
+}
+
+build.args-append   V=1 VERBOSE=1
+
+# with everything defined/declared as intended we can now
+# handle the post-patch step with its reinplace statements.
 post-patch {
     set python_bin ${prefix}/bin/python2.7
     reinplace -W ${worksrcpath} "s|@@PYTHON@@|${python_bin}|g" \
@@ -164 +220 @@
     reinplace -W ${worksrcpath} "s| -Werror||g" \
                                 lib-src/portaudio-v19/configure.in \
                                 lib-src/portaudio-v19/configure
+    reinplace -W ${worksrcpath} "s|@LDFLAGS@|${configure.ldflags}|g" \
+                                lib-src/libvamp/Makefile.in
     platform darwin {
         # audacity 2.1.2 contains C++ files that include system SDK headers and ObjC code on OS X;
         # they must thus be built as ObjC++
@@ -192 +250 @@
     }
 }
 
-# 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