audacity: Update to 2.3.2

Changes in 2.3.2

    Audacity now includes the LAME MP3 encoder.
    There is a new Select button in the track panel to select the whole track.
    Audacity mod-script-pipe for driving Audacity from Python now comes with Audacity and it can be enabled via preferences.
    Over 20 bugs fixed since 2.3.1. The most serious bug was that Audacity 2.3.1 would crash if append-recording to a collapsed track.

Changes in 2.3.1

About 25 bugs fixed (since 2.3.1)

    Options and preferences:
        Microfades are now an opt-in feature. They were always on in 2.3.0.
        The advanced vertical zooming option is now available in the View->Zoom menu.
    Regular interval labels now support range labels.

Changes in 2.3.0 (withdrawn release)

Many new features and over 90 bugs fixed (since 2.2.2)

    New feature – “Punch and Roll Recording”
    Pinned-play-head can now be repositioned by dragging
    Play-at-speed now can be adjusted whilst playing.
    Toolbars controlling volume and speed can now be resized for greater precision
    Macros (formerly ‘Chains’) substantially extended
        New Macro palette
        Macros can be bound to keyboard keys
    New commands
        New ‘Tools’ menu
        New ‘Scriptables’ commands
    Nyquist gains AUD-DO command
    Nyquist effects are now translatable and translated
    More dialogs have help buttons now
    Increased legibility of trackname display
    Half-wave option for collapsed tracks
    Sliding Stretch
    Dialog (option) for entering labels

10 files changed, 78 insertions, 79 deletions

diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index f94a2f95bc7..11cec5a0bc2 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.118 2019/02/10 17:14:42 nia Exp $
+# $NetBSD: Makefile,v 1.119 2019/06/04 23:09:51 nia Exp $
 
-DISTNAME=		audacity-2.2.2
+DISTNAME=		audacity-2.3.2
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_GITHUB:=audacity/}
 GITHUB_PROJECT=		Audacity
@@ -27,23 +27,40 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-nyquist=yes
 CONFIGURE_ARGS+=	--with-expat=system
 CONFIGURE_ARGS+=	--with-ffmpeg=system
-CONFIGURE_ARGS+=	--with-id3tag=system
+CONFIGURE_ARGS+=	--with-lame=system
 CONFIGURE_ARGS+=	--with-libflac=system
-CONFIGURE_ARGS+=	--with-libmad=system
+CONFIGURE_ARGS+=	--with-libid3tag=system
 CONFIGURE_ARGS+=	--with-libsamplerate=system
 CONFIGURE_ARGS+=	--with-libsndfile=system
+CONFIGURE_ARGS+=	--with-libtwolame=system
+CONFIGURE_ARGS+=	--with-libvamp=local
+CONFIGURE_ARGS+=	--with-libvorbis=system
 CONFIGURE_ARGS+=	--with-lv2=system
 CONFIGURE_ARGS+=	--with-midi=local
+# configure: error: Your version of portaudio does not include
+# required Pa_GetStreamHostApiType function
 CONFIGURE_ARGS+=	--with-portaudio=local
+CONFIGURE_ARGS+=	--with-sbsms=local
 CONFIGURE_ARGS+=	--with-soundtouch=system
-CONFIGURE_ARGS+=	--with-twolame=system
-CONFIGURE_ARGS+=	--with-vorbis=system
 CONFIGURE_ARGS+=	--with-libsoxr=system
-.if ${OPSYS} != "Linux"
+CONFIGURE_ARGS+=	--with-widgetextra=local
+
+# for internal portaudio...
+
+.if ${OPSYS} == "Linux"
+CONFIGURE_ARGS+=	--with-alsa
+.else
 CONFIGURE_ARGS+=	--without-alsa
 CONFIGURE_ENV+=		ac_cv_header_pa_linux_alsa_h=no
 .endif
-CONFIGURE_ARGS+=	--without-xaudio
+
+.include "../../mk/oss.buildlink3.mk"
+
+.if !empty(OSS_TYPE) && ${OSS_TYPE} != "none"
+CONFIGURE_ARGS+=	--with-oss
+.else
+CONFIGURE_ARGS+=	--without-oss
+.endif
 
 CONFIG_GUESS_OVERRIDE=		\
 	config.guess */config.guess */*/config.guess */*/*/config.guess
@@ -74,16 +91,14 @@ post-install:
 
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../multimedia/libogg/buildlink3.mk"
+.include "../../audio/alsa-lib/buildlink3.mk"
 .include "../../audio/lilv/buildlink3.mk"
 .include "../../audio/lv2/buildlink3.mk"
-.include "../../audio/alsa-lib/buildlink3.mk"
 .include "../../audio/soundtouch/buildlink3.mk"
 BUILDLINK_API_DEPENDS.twolame+=	twolame>=0.3.9
 .include "../../audio/twolame/buildlink3.mk"
 .include "../../audio/lame/buildlink3.mk"
 .include "../../audio/libid3tag/buildlink3.mk"
-.include "../../audio/libmad/buildlink3.mk"
 .include "../../audio/libsamplerate/buildlink3.mk"
 .include "../../audio/libsoxr/buildlink3.mk"
 .include "../../audio/libsndfile/buildlink3.mk"
@@ -93,9 +108,9 @@ BUILDLINK_API_DEPENDS.twolame+=	twolame>=0.3.9
 BUILDLINK_API_DEPENDS.flac+=	flac>=1.3.0
 .include "../../audio/flac/buildlink3.mk"
 .include "../../multimedia/ffmpeg4/buildlink3.mk"
+.include "../../multimedia/libogg/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../x11/wxGTK30/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/audacity/PLIST b/audio/audacity/PLIST
index 074187c698f..9e1a623fc66 100644
--- a/audio/audacity/PLIST
+++ b/audio/audacity/PLIST
@@ -1,18 +1,19 @@
-@comment $NetBSD: PLIST,v 1.14 2019/02/10 17:14:42 nia Exp $
+@comment $NetBSD: PLIST,v 1.15 2019/06/04 23:09:51 nia Exp $
 bin/audacity
 lib/libFileDialog.so.0
 man/man1/audacity.1
 share/appdata/audacity.appdata.xml
 share/applications/audacity.desktop
 share/audacity/EQDefaultCurves.xml
+share/audacity/include/audacity/ComponentInterface.h
 share/audacity/include/audacity/ConfigInterface.h
 share/audacity/include/audacity/EffectAutomationParameters.h
 share/audacity/include/audacity/EffectInterface.h
-share/audacity/include/audacity/IdentInterface.h
 share/audacity/include/audacity/ImporterInterface.h
 share/audacity/include/audacity/ModuleInterface.h
 share/audacity/include/audacity/PluginInterface.h
 share/audacity/include/audacity/Types.h
+share/audacity/nyquist/aud-do-support.lsp
 share/audacity/nyquist/dspprims.lsp
 share/audacity/nyquist/envelopes.lsp
 share/audacity/nyquist/equalizer.lsp
@@ -72,9 +73,11 @@ share/audacity/plug-ins/highpass.ny
 share/audacity/plug-ins/limiter.ny
 share/audacity/plug-ins/lowpass.ny
 share/audacity/plug-ins/notch.ny
+share/audacity/plug-ins/nyquist-plug-in-installer.ny
 share/audacity/plug-ins/pluck.ny
 share/audacity/plug-ins/rhythmtrack.ny
 share/audacity/plug-ins/rissetdrum.ny
+share/audacity/plug-ins/rms.ny
 share/audacity/plug-ins/sample-data-export.ny
 share/audacity/plug-ins/sample-data-import.ny
 share/audacity/plug-ins/tremolo.ny
diff --git a/audio/audacity/distinfo b/audio/audacity/distinfo
index e1e86f3d12c..5c3ac3cf405 100644
--- a/audio/audacity/distinfo
+++ b/audio/audacity/distinfo
@@ -1,14 +1,13 @@
-$NetBSD: distinfo,v 1.37 2019/02/10 17:14:42 nia Exp $
+$NetBSD: distinfo,v 1.38 2019/06/04 23:09:51 nia Exp $
 
-SHA1 (audacity-2.2.2.tar.gz) = 84b0f29c7e07bcc0ef7d946d16f4d094a1612778
-RMD160 (audacity-2.2.2.tar.gz) = 6ceee54811742b071af6823d8e69bea1da039fec
-SHA512 (audacity-2.2.2.tar.gz) = 311a5f3413e7faf40dc5639b2b9f8b0d03d1a410c50d894ca7abf3fe5733a29b710ccf7e3215d97dd9142e93c0ab5e13955dfd13146b03f927f74465459a6457
-Size (audacity-2.2.2.tar.gz) = 25947462 bytes
+SHA1 (audacity-2.3.2.tar.gz) = b91b88aa68521a03fa5cc7dacaf5eb39f92e3b6f
+RMD160 (audacity-2.3.2.tar.gz) = 8bf05565f6a4afd464670b2e6fb5ed261a886ef2
+SHA512 (audacity-2.3.2.tar.gz) = a59d6e9e974d5f78f5ca561e3bea31fc1b3e88f9ea60b2df7ce8bcec264d886f3fdc8f20030e11a86daff8ffeb735850b5e5f73c45fbef0bfcc58692423e7cd0
+Size (audacity-2.3.2.tar.gz) = 61972597 bytes
 SHA1 (patch-Makefile.in) = 2aca8c2ae0af7863f8f090a707c08fba693c7c86
 SHA1 (patch-aa) = 67c0ec5ff99004d9035de13f0263add46ed8c994
-SHA1 (patch-am) = 1f380ec8022c5849c0297ba181c9ff6223516476
-SHA1 (patch-lib-src_FileDialog_Makefile.am) = a1bf7353f970f24dde1f069427d16b0473e2fa71
-SHA1 (patch-lib-src_FileDialog_Makefile.in) = 60ee705c6096cbb32278fca8ab73d634126aaca4
+SHA1 (patch-lib-src_FileDialog_Makefile.am) = efa6ca612f3984a4cf8150e3c624e347d144af87
+SHA1 (patch-lib-src_FileDialog_Makefile.in) = 44ca2539d68ab3951ae44377ed56f574785c1b08
 SHA1 (patch-lib-src_lib-widget-extra_Makefile.am) = 03d080c141259fbf02a9c5a70ce06625fcebf75e
 SHA1 (patch-lib-src_libnyquist_nyquist_nyqsrc_sndread.c) = dbc0b5b88043c7b2895742e78e6a5990f65012ef
 SHA1 (patch-lib-src_libnyquist_nyquist_sys_unix_switches.h) = d313f137f11d3e0fafa383ddeccbc89021e9ddee
@@ -16,8 +15,7 @@ SHA1 (patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h) = 2d4558f059d86633a1fcdda2
 SHA1 (patch-lib-src_portaudio-v19_Makefile.in) = 9e86fbd93d322322b8416ef6b43ba5c98141c986
 SHA1 (patch-lib-src_portmixer_src-extra_Makefile.am) = 9a0d5be37753683a2cade42673edb3d08e01ab4d
 SHA1 (patch-lib-src_sbsms_src-extra_Makefile.am) = 2beca18a286de1b26f4f96976fb58e1665d0531c
-SHA1 (patch-mac_scripts_create__info__header.sh) = 3fa02a88a2dffbabf58adcb5be2e5798d28ae643
 SHA1 (patch-src_AudioIO.cpp) = 1b44c68c4233b24a5fa4e17515eb237fee0e283a
-SHA1 (patch-src_effects_Effect.cpp) = 46c0ce811ef331367058081f6e5f95daa96e990d
-SHA1 (patch-src_effects_EffectManager.cpp) = d0d8609fffb8de4108e75f78ef66ca2c3261b19e
+SHA1 (patch-src_effects_Effect.cpp) = 78d9a8f1bdb70284d2ad57243d10f56c993759c6
+SHA1 (patch-src_effects_EffectManager.cpp) = 8ce8679cf4530b1fbb0b1d63896be98c41b27bb6
 SHA1 (patch-src_effects_NoiseRemoval.cpp) = 6d72545cde66ac90d4eb3821a3a3f384ccbf46f2
diff --git a/audio/audacity/options.mk b/audio/audacity/options.mk
index 20abbf2e234..183da39452d 100644
--- a/audio/audacity/options.mk
+++ b/audio/audacity/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.3 2019/02/10 17:14:42 nia Exp $
+# $NetBSD: options.mk,v 1.4 2019/06/04 23:09:51 nia Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.audacity
-PKG_SUPPORTED_OPTIONS=		debug jack ladspa nls
+PKG_SUPPORTED_OPTIONS=		debug jack ladspa mad nls
 PKG_SUGGESTED_OPTIONS+=		ladspa nls
 PLIST_VARS+=			nls
 
@@ -13,8 +13,21 @@ CONFIGURE_ARGS+=		--enable-debug=yes
 CONFIGURE_ARGS+=		--enable-debug=no
 .endif
 
+# for internal portaudio...
 .if !empty(PKG_OPTIONS:Mjack)
+CONFIGURE_ARGS+=		--with-jack
 .include "../../audio/jack/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=		--without-jack
+.endif
+
+# libmad is disabled by default because it's been unmaintained
+# since 2004 and is a pile of CVEs.
+.if !empty(PKG_OPTIONS:Mmad)
+CONFIGURE_ARGS+=		--with-libmad
+.include "../../audio/libmad/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=		--with-libmad=no
 .endif
 
 .if !empty(PKG_OPTIONS:Mladspa)
diff --git a/audio/audacity/patches/patch-am b/audio/audacity/patches/patch-am
deleted file mode 100644
index 155093fa98b..00000000000
--- a/audio/audacity/patches/patch-am
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-am,v 1.8 2019/02/10 17:14:42 nia Exp $
-
-Don't hardcode TMPDIR.
-
---- src/AudacityApp.cpp.orig	2018-02-14 07:11:20.000000000 +0000
-+++ src/AudacityApp.cpp
-@@ -1281,7 +1281,7 @@ bool AudacityApp::OnInit()
-    wxString home = wxGetHomeDir();
- 
-    /* On Unix systems, the default temp dir is in /var/tmp. */
--   defaultTempDir.Printf(wxT("/var/tmp/audacity-%s"), wxGetUserId());
-+   defaultTempDir.Printf(wxT("%s/audacity-%s"), home.c_str(), wxGetUserId());
- 
- // DA: Path env variable.
- #ifndef EXPERIMENTAL_DA
diff --git a/audio/audacity/patches/patch-lib-src_FileDialog_Makefile.am b/audio/audacity/patches/patch-lib-src_FileDialog_Makefile.am
index ba2683bf1be..1e83d9e1d29 100644
--- a/audio/audacity/patches/patch-lib-src_FileDialog_Makefile.am
+++ b/audio/audacity/patches/patch-lib-src_FileDialog_Makefile.am
@@ -1,8 +1,8 @@
-$NetBSD: patch-lib-src_FileDialog_Makefile.am,v 1.2 2016/06/05 01:02:38 ryoon Exp $
+$NetBSD: patch-lib-src_FileDialog_Makefile.am,v 1.3 2019/06/04 23:09:51 nia Exp $
 
 don't build a shared library of this.
 
---- lib-src/FileDialog/Makefile.am.orig	2016-01-13 14:31:17.000000000 +0000
+--- lib-src/FileDialog/Makefile.am.orig	2019-05-04 10:38:57.000000000 +0000
 +++ lib-src/FileDialog/Makefile.am
 @@ -1,6 +1,6 @@
  ACLOCAL_AMFLAGS = -I m4
@@ -10,5 +10,5 @@ don't build a shared library of this.
 -lib_LTLIBRARIES = libFileDialog.la
 +noinst_LTLIBRARIES = libFileDialog.la
  
+ libFileDialog_la_LIBTOOLFLAGS = --tag=CXX
  libFileDialog_la_CPPFLAGS = $(WX_CXXFLAGS) -Wno-deprecated-declarations
- libFileDialog_la_LIBADD = $(WX_LIBS)
diff --git a/audio/audacity/patches/patch-lib-src_FileDialog_Makefile.in b/audio/audacity/patches/patch-lib-src_FileDialog_Makefile.in
index 68ea3ac5744..07c7f9efb64 100644
--- a/audio/audacity/patches/patch-lib-src_FileDialog_Makefile.in
+++ b/audio/audacity/patches/patch-lib-src_FileDialog_Makefile.in
@@ -1,9 +1,9 @@
-$NetBSD: patch-lib-src_FileDialog_Makefile.in,v 1.2 2019/02/10 17:14:42 nia Exp $
+$NetBSD: patch-lib-src_FileDialog_Makefile.in,v 1.3 2019/06/04 23:09:51 nia Exp $
 
 * Do not build shared library
 * Fix libtool tag issue
 
---- lib-src/FileDialog/Makefile.in.orig	2018-02-14 07:11:20.000000000 +0000
+--- lib-src/FileDialog/Makefile.in.orig	2019-05-04 10:38:57.000000000 +0000
 +++ lib-src/FileDialog/Makefile.in
 @@ -1,7 +1,7 @@
 -# Makefile.in generated by automake 1.14.1 from Makefile.am.
@@ -121,10 +121,10 @@ $NetBSD: patch-lib-src_FileDialog_Makefile.in,v 1.2 2019/02/10 17:14:42 nia Exp
  ACLOCAL_AMFLAGS = -I m4
 -lib_LTLIBRARIES = libFileDialog.la
 +noinst_LTLIBRARIES = libFileDialog.la
+ libFileDialog_la_LIBTOOLFLAGS = --tag=CXX
  libFileDialog_la_CPPFLAGS = $(WX_CXXFLAGS) \
  	-Wno-deprecated-declarations $(am__append_1)
- libFileDialog_la_LIBADD = $(WX_LIBS) $(am__append_2)
-@@ -445,7 +428,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+@@ -446,7 +429,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
  	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
  	$(am__cd) $(top_srcdir) && \
  	  $(AUTOMAKE) --foreign Makefile
@@ -132,7 +132,7 @@ $NetBSD: patch-lib-src_FileDialog_Makefile.in,v 1.2 2019/02/10 17:14:42 nia Exp
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
  	  *config.status*) \
-@@ -465,33 +447,9 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(
+@@ -466,33 +448,9 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(
  	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
  $(am__aclocal_m4_deps):
  
@@ -169,7 +169,7 @@ $NetBSD: patch-lib-src_FileDialog_Makefile.in,v 1.2 2019/02/10 17:14:42 nia Exp
  	locs=`for p in $$list; do echo $$p; done | \
  	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
  	      sort -u`; \
-@@ -746,15 +704,15 @@ dist-xz: distdir
+@@ -747,15 +705,15 @@ dist-xz: distdir
  	$(am__post_remove_distdir)
  
  dist-tarZ: distdir
@@ -189,7 +189,7 @@ $NetBSD: patch-lib-src_FileDialog_Makefile.in,v 1.2 2019/02/10 17:14:42 nia Exp
  	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
  	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
  	$(am__post_remove_distdir)
-@@ -790,17 +748,17 @@ distcheck: dist
+@@ -791,17 +749,17 @@ distcheck: dist
  	esac
  	chmod -R a-w $(distdir)
  	chmod u+w $(distdir)
@@ -211,7 +211,7 @@ $NetBSD: patch-lib-src_FileDialog_Makefile.in,v 1.2 2019/02/10 17:14:42 nia Exp
  	  && $(MAKE) $(AM_MAKEFLAGS) \
  	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
  	  && $(MAKE) $(AM_MAKEFLAGS) check \
-@@ -857,9 +815,6 @@ check-am: all-am
+@@ -858,9 +816,6 @@ check-am: all-am
  check: check-am
  all-am: Makefile $(LTLIBRARIES)
  installdirs:
@@ -221,7 +221,7 @@ $NetBSD: patch-lib-src_FileDialog_Makefile.in,v 1.2 2019/02/10 17:14:42 nia Exp
  install: install-am
  install-exec: install-exec-am
  install-data: install-data-am
-@@ -898,7 +853,7 @@ maintainer-clean-generic:
+@@ -899,7 +854,7 @@ maintainer-clean-generic:
  	@echo "it deletes files that may require special tools to rebuild."
  clean: clean-am
  
@@ -230,7 +230,7 @@ $NetBSD: patch-lib-src_FileDialog_Makefile.in,v 1.2 2019/02/10 17:14:42 nia Exp
  	mostlyclean-am
  
  distclean: distclean-am
-@@ -926,7 +881,7 @@ install-dvi: install-dvi-am
+@@ -927,7 +882,7 @@ install-dvi: install-dvi-am
  
  install-dvi-am:
  
@@ -239,7 +239,7 @@ $NetBSD: patch-lib-src_FileDialog_Makefile.in,v 1.2 2019/02/10 17:14:42 nia Exp
  
  install-html: install-html-am
  
-@@ -968,26 +923,28 @@ ps: ps-am
+@@ -969,26 +924,28 @@ ps: ps-am
  
  ps-am:
  
diff --git a/audio/audacity/patches/patch-mac_scripts_create__info__header.sh b/audio/audacity/patches/patch-mac_scripts_create__info__header.sh
deleted file mode 100644
index 1215fe8ec73..00000000000
--- a/audio/audacity/patches/patch-mac_scripts_create__info__header.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-mac_scripts_create__info__header.sh,v 1.1 2019/02/10 17:14:42 nia Exp $
-
-Portability fix.
-
---- mac/scripts/create_info_header.sh.orig	2018-02-14 07:11:20.000000000 +0000
-+++ mac/scripts/create_info_header.sh
-@@ -21,7 +21,7 @@ done
- cd ${TOPLEVEL}
- mkdir -p mac/build
- eval $(g++ -E -dM src/Audacity.h | awk '/#define *AUDACITY_(VERSION|RELEASE|REVISION|MODLEVEL) /{print $2 "=" $3}')
--if [ $CONFIGURATION == 'Debug' ]
-+if [ $CONFIGURATION = 'Debug' ]
- then
-     AUDACITY_EXECUTABLE=Audacity
- else
diff --git a/audio/audacity/patches/patch-src_effects_Effect.cpp b/audio/audacity/patches/patch-src_effects_Effect.cpp
index d27f8b56709..6933dd04f7a 100644
--- a/audio/audacity/patches/patch-src_effects_Effect.cpp
+++ b/audio/audacity/patches/patch-src_effects_Effect.cpp
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_effects_Effect.cpp,v 1.2 2019/02/10 17:14:42 nia Exp $
+$NetBSD: patch-src_effects_Effect.cpp,v 1.3 2019/06/04 23:09:51 nia Exp $
 
 SunOS needs alloca.h for alloca().
 
---- src/effects/Effect.cpp.orig	2018-02-14 07:11:20.000000000 +0000
+--- src/effects/Effect.cpp.orig	2019-05-04 10:38:57.000000000 +0000
 +++ src/effects/Effect.cpp
-@@ -61,6 +61,10 @@ greater use in future.
+@@ -78,6 +78,10 @@ greater use in future.
  #include <Cocoa/Cocoa.h>
  #endif
  
@@ -12,6 +12,6 @@ SunOS needs alloca.h for alloca().
 +#include <alloca.h>
 +#endif
 +
- #include "../Experimental.h"
  #include "../commands/ScreenshotCommand.h"
  
+ #include <unordered_map>
diff --git a/audio/audacity/patches/patch-src_effects_EffectManager.cpp b/audio/audacity/patches/patch-src_effects_EffectManager.cpp
index 9cd4524afd5..727c97ac865 100644
--- a/audio/audacity/patches/patch-src_effects_EffectManager.cpp
+++ b/audio/audacity/patches/patch-src_effects_EffectManager.cpp
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_effects_EffectManager.cpp,v 1.2 2019/02/10 17:14:42 nia Exp $
+$NetBSD: patch-src_effects_EffectManager.cpp,v 1.3 2019/06/04 23:09:51 nia Exp $
 
 SunOS needs alloca.h for alloca().
 
---- src/effects/EffectManager.cpp.orig	2018-02-14 07:11:20.000000000 +0000
+--- src/effects/EffectManager.cpp.orig	2019-05-04 10:38:57.000000000 +0000
 +++ src/effects/EffectManager.cpp
-@@ -15,6 +15,10 @@
+@@ -27,6 +27,10 @@ effects.
  #include <wx/stopwatch.h>
  #include <wx/tokenzr.h>
  
@@ -12,6 +12,6 @@ SunOS needs alloca.h for alloca().
 +#include <alloca.h>
 +#endif
 +
- #include "../Experimental.h"
  #include "../widgets/ErrorDialog.h"
  
+ #if defined(EXPERIMENTAL_EFFECTS_RACK)