Update to 2.1.2

* fosshub.com does not provide direct link for distfile

Changelog:
2.1.2
Improvements

    Effects
        Noise Reduction defaults changed.

    Interface

        We've made several improvements to the spectrogram view of tracks which are particularly valuable for vocal work.

            New option 'Spectral Reassignment'. This algorithm deduces a 'finer' spectrogram for vocal work.
            Four new Spectrogram scales.
            Improvement to the Pitch (EAC) algorithm  -  cleaner (sharper) display.
            Spectrogram Settings are now available per-track.

    Other Changes
        Upgraded from wxWidgets 2.8.12 to wxWidgets 3.0.2.
        Restructuring of the Preferences Menu
        Restructuring of the Track Dropdown Menu (for the Spectrograms)
        The Noise Reduction "Frequency smoothing" default has been increased to 3 to help avoid metallic artifacts. Resetting Preferences or deleting audacity.cfg will set the new default.
        (Windows) The location of Audacity's work-in-progress folder has been changed, to avoid problems where certain disk cleaners treated them as deletable temporary files.

Bug Fixes

    Crashes
        Crashes on reading .wav files with many channels (CVE-2016-2540) and corrupt .mp2 files (CVE-2016-2541) have been fixed. Thanks to Chris Navarrete from Fortinet's FortiGuard Labs for notifying us of these bugs and associated security risk.

2.1.1
Improvements

    Effects
        Noise Reduction defaults changed.

    Interface

        We've made several improvements to the spectrogram view of tracks which are particularly valuable for vocal work.

            New option 'Spectral Reassignment'. This algorithm deduces a 'finer' spectrogram for vocal work.
            Four new Spectrogram scales.
            Improvement to the Pitch (EAC) algorithm  -  cleaner (sharper) display.
            Spectrogram Settings are now available per-track.

    Other Changes
        Upgraded from wxWidgets 2.8.12 to wxWidgets 3.0.2.
        Restructuring of the Preferences Menu
        Restructuring of the Track Dropdown Menu (for the Spectrograms)
        The Noise Reduction "Frequency smoothing" default has been increased to 3 to help avoid metallic artifacts. Resetting Preferences or deleting audacity.cfg will set the new default.
        (Windows) The location of Audacity's work-in-progress folder has been changed, to avoid problems where certain disk cleaners treated them as deletable temporary files.

Bug Fixes

    Crashes
        Crashes on reading .wav files with many channels (CVE-2016-2540) and corrupt .mp2 files (CVE-2016-2541) have been fixed. Thanks to Chris Navarrete from Fortinet's FortiGuard Labs for notifying us of these bugs and associated security risk.

11 files changed, 390 insertions, 328 deletions

diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index 6aed3541b17..060cddaa072 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.100 2015/11/18 14:19:47 ryoon Exp $
+# $NetBSD: Makefile,v 1.101 2016/06/05 01:02:38 ryoon Exp $
 
-DISTNAME=		audacity-minsrc-2.1.0
+DISTNAME=		audacity-minsrc-2.1.2
 PKGNAME=		${DISTNAME:S/-minsrc//1}
-PKGREVISION=		8
 CATEGORIES=		audio
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=audacity/}
+# sadly fosshub.com does not provice hot link
+MASTER_SITES=		${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=		.tar.xz
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -13,10 +13,12 @@ COMMENT=		Audio editor
 LICENSE=		gnu-gpl-v2 # AND cc-by-v3.0-license
 
 USE_LIBTOOL=		yes
-USE_TOOLS+=		automake autoreconf
+USE_TOOLS+=		automake autoreconf bash
 USE_TOOLS+=		gmake intltool msgfmt msgmerge pkg-config
 USE_TOOLS+=		xgettext zip:run
 USE_LANGUAGES=		c c++
+WRAPPER_SHELL=		${BASH}
+CONFIG_SHELL=		${BASH}
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-nyquist=yes
 CONFIGURE_ARGS+=	--with-expat=system
@@ -33,6 +35,7 @@ CONFIGURE_ARGS+=	--with-sbsms=system
 CONFIGURE_ARGS+=	--with-soundtouch=system
 CONFIGURE_ARGS+=	--with-twolame=system
 CONFIGURE_ARGS+=	--with-vorbis=system
+CONFIGURE_ARGS+=	--with-libsoxr=system
 CONFIGURE_ARGS+=	--without-xaudio
 
 CONFIG_GUESS_OVERRIDE=		\
@@ -45,7 +48,6 @@ BUILDLINK_TRANSFORM+=	opt:-ldl:${BUILDLINK_LDADD.dl:M*}
 
 # regen Makefile.in to avoid being built as shared libraries
 pre-configure:
-	cd ${WRKSRC}/lib-src/FileDialog && ${PKGSRC_SETENV} autoreconf -fiv
 	cd ${WRKSRC}/lib-src/portaudio-v19 && ${PKGSRC_SETENV} autoreconf -fiv
 	cd ${WRKSRC}/lib-src/portmixer && ${PKGSRC_SETENV} autoreconf -fiv
 	cd ${WRKSRC}/lib-src/lib-widget-extra && autoreconf -fiv
@@ -65,13 +67,15 @@ BUILDLINK_API_DEPENDS.twolame+=	twolame>=0.3.9
 .include "../../audio/libmad/buildlink3.mk"
 .include "../../audio/libsbsms/buildlink3.mk"
 .include "../../audio/libsamplerate/buildlink3.mk"
+.include "../../audio/libsoxr/buildlink3.mk"
 .include "../../audio/libsndfile/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 #.include "../../audio/portaudio-devel/buildlink3.mk" # Needs Pa_GetStreamHostApiType
+.include "../../audio/suil/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.flac+=	flac>=1.3.0
 .include "../../audio/flac/buildlink3.mk"
-.include "../../multimedia/ffmpeg1/buildlink3.mk"
+.include "../../multimedia/ffmpeg3/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../x11/wxGTK30/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
diff --git a/audio/audacity/PLIST b/audio/audacity/PLIST
index cff3ab2e2bf..6d6194c986b 100644
--- a/audio/audacity/PLIST
+++ b/audio/audacity/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2015/09/18 21:19:07 mrg Exp $
+@comment $NetBSD: PLIST,v 1.13 2016/06/05 01:02:38 ryoon Exp $
 bin/audacity
 man/man1/audacity.1
 share/appdata/audacity.appdata.xml
@@ -12,7 +12,6 @@ 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/bug.lsp
 share/audacity/nyquist/dspprims.lsp
 share/audacity/nyquist/envelopes.lsp
 share/audacity/nyquist/equalizer.lsp
@@ -50,25 +49,34 @@ share/audacity/nyquist/seqmidi.lsp
 share/audacity/nyquist/sndfnint.lsp
 share/audacity/nyquist/stk.lsp
 share/audacity/nyquist/system.lsp
+share/audacity/nyquist/test.lsp
+share/audacity/nyquist/upic.sal
+share/audacity/nyquist/velocity.lsp
 share/audacity/nyquist/xlinit.lsp
 share/audacity/nyquist/xm.lsp
 share/audacity/plug-ins/SilenceMarker.ny
 share/audacity/plug-ins/SoundFinder.ny
+share/audacity/plug-ins/SpectralEditMulti.ny
+share/audacity/plug-ins/SpectralEditParametricEQ.ny
+share/audacity/plug-ins/SpectralEditShelves.ny
 share/audacity/plug-ins/StudioFadeOut.ny
 share/audacity/plug-ins/adjustable-fade.ny
 share/audacity/plug-ins/beat.ny
 share/audacity/plug-ins/clicktrack.ny
 share/audacity/plug-ins/clipfix.ny
+share/audacity/plug-ins/crossfadeclips.ny
 share/audacity/plug-ins/crossfadetracks.ny
 share/audacity/plug-ins/delay.ny
 share/audacity/plug-ins/equalabel.ny
 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/pluck.ny
 share/audacity/plug-ins/rissetdrum.ny
 share/audacity/plug-ins/sample-data-export.ny
 share/audacity/plug-ins/tremolo.ny
+share/audacity/plug-ins/vocalrediso.ny
 share/audacity/plug-ins/vocalremover.ny
 share/audacity/plug-ins/vocoder.ny
 share/doc/audacity/LICENSE.txt
@@ -86,7 +94,7 @@ ${PLIST.nls}share/locale/bg/LC_MESSAGES/audacity.mo
 ${PLIST.nls}share/locale/bn/LC_MESSAGES/audacity.mo
 ${PLIST.nls}share/locale/bs/LC_MESSAGES/audacity.mo
 ${PLIST.nls}share/locale/ca/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/ca@valencia/LC_MESSAGES/audacity.mo
+${PLIST.nls}share/locale/ca_ES@valencia/LC_MESSAGES/audacity.mo
 ${PLIST.nls}share/locale/cs/LC_MESSAGES/audacity.mo
 ${PLIST.nls}share/locale/cy/LC_MESSAGES/audacity.mo
 ${PLIST.nls}share/locale/da/LC_MESSAGES/audacity.mo
@@ -117,8 +125,8 @@ ${PLIST.nls}share/locale/nb/LC_MESSAGES/audacity.mo
 ${PLIST.nls}share/locale/nl/LC_MESSAGES/audacity.mo
 ${PLIST.nls}share/locale/oc/LC_MESSAGES/audacity.mo
 ${PLIST.nls}share/locale/pl/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/pt/LC_MESSAGES/audacity.mo
 ${PLIST.nls}share/locale/pt_BR/LC_MESSAGES/audacity.mo
+${PLIST.nls}share/locale/pt_PT/LC_MESSAGES/audacity.mo
 ${PLIST.nls}share/locale/ro/LC_MESSAGES/audacity.mo
 ${PLIST.nls}share/locale/ru/LC_MESSAGES/audacity.mo
 ${PLIST.nls}share/locale/sk/LC_MESSAGES/audacity.mo
@@ -131,7 +139,7 @@ ${PLIST.nls}share/locale/tg/LC_MESSAGES/audacity.mo
 ${PLIST.nls}share/locale/tr/LC_MESSAGES/audacity.mo
 ${PLIST.nls}share/locale/uk/LC_MESSAGES/audacity.mo
 ${PLIST.nls}share/locale/vi/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/zh/LC_MESSAGES/audacity.mo
+${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/audacity.mo
 ${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/audacity.mo
 share/mime/packages/audacity.xml
 share/pixmaps/audacity.xpm
diff --git a/audio/audacity/distinfo b/audio/audacity/distinfo
index d4270ea8dc3..49b5c0f2bdb 100644
--- a/audio/audacity/distinfo
+++ b/audio/audacity/distinfo
@@ -1,21 +1,21 @@
-$NetBSD: distinfo,v 1.31 2015/11/03 01:12:25 agc Exp $
+$NetBSD: distinfo,v 1.32 2016/06/05 01:02:38 ryoon Exp $
 
-SHA1 (audacity-minsrc-2.1.0.tar.xz) = a53bce0276240bb56f2e3fd1bf235a4ef688caa3
-RMD160 (audacity-minsrc-2.1.0.tar.xz) = 16b0e91222b91b47eeb533d4725b68e5548c057f
-SHA512 (audacity-minsrc-2.1.0.tar.xz) = 5ed441b567bc72a794d9d5a1248db137d1a6d019b5fcdcb8b536a509ecacbf5d85b50c2a0cad484f84053dff4ffa662027cca157fde4b18f9d53b2bd106c34b4
-Size (audacity-minsrc-2.1.0.tar.xz) = 5104924 bytes
+SHA1 (audacity-minsrc-2.1.2.tar.xz) = d0b8924b846f833182e674d621b28eb666cc97d6
+RMD160 (audacity-minsrc-2.1.2.tar.xz) = 47fccf8b96b6db95a677045bf122084d233bd80c
+SHA512 (audacity-minsrc-2.1.2.tar.xz) = 46bc68825d29e88b14a674749532345ab63673ea1b85ad0d2a1b72b0974c74d2175e0ef307dad735592d18e56c1e0c65f994f4ee05d9e0f1aec194cd02c930da
+Size (audacity-minsrc-2.1.2.tar.xz) = 7233500 bytes
 SHA1 (patch-Makefile.in) = 8a770c2ab0494359c22d7f8e1b548fb83c2c00ff
 SHA1 (patch-aa) = 67c0ec5ff99004d9035de13f0263add46ed8c994
-SHA1 (patch-am) = 23ffc055ee81fad7b3aab8f7dd447e641644be96
-SHA1 (patch-lib-src_FileDialog_Makefile.am) = 234c29402f157000dc3afb0b39e23f107c50eaf3
-SHA1 (patch-lib-src_lib-widget-extra_Makefile.am) = afa60d928f9d3de287815b4f7aadd4bbcc700a21
-SHA1 (patch-lib-src_libnyquist_nyquist_ffts_src_fftlib.c) = 3724b3e7cdd1f45cd38c76f2da3a3af6048dddb3
-SHA1 (patch-lib-src_libnyquist_nyquist_nyqsrc_sndread.c) = c7a6c6a7f0dbb3828a4d5780ec94908b40d974d2
+SHA1 (patch-am) = 732764ddf9546524bea13f45cb8d3ffa00c76eb1
+SHA1 (patch-lib-src_FileDialog_Makefile.am) = a1bf7353f970f24dde1f069427d16b0473e2fa71
+SHA1 (patch-lib-src_FileDialog_Makefile.in) = fe4569e6f7d4fbd54e0aa2dd84e7474adb2ff764
+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
-SHA1 (patch-lib-src_libnyquist_nyquist_xlisp_xlfio.c) = a55127d6173d3ffb729fde7358bedd7c1320bf09
 SHA1 (patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h) = a0d194f7f7f278cfba1f54269e0323990abb73f3
 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-src_FFmpeg.h) = 664efb8a668a9dd5f76704e5a46c495a8c2c3a4d
 SHA1 (patch-src_effects_NoiseRemoval.cpp) = 6d72545cde66ac90d4eb3821a3a3f384ccbf46f2
 SHA1 (patch-src_effects_VST_VSTEffect.cpp) = 76a55afd7977505801dd129e139c9782bfd8dfcb
diff --git a/audio/audacity/patches/patch-am b/audio/audacity/patches/patch-am
index cc16a6d2616..a717fd2cf1b 100644
--- a/audio/audacity/patches/patch-am
+++ b/audio/audacity/patches/patch-am
@@ -1,12 +1,12 @@
-$NetBSD: patch-am,v 1.6 2015/04/20 13:38:23 rodent Exp $
+$NetBSD: patch-am,v 1.7 2016/06/05 01:02:38 ryoon Exp $
 
 Don't hardcode TMPDIR.
 
---- src/AudacityApp.cpp.orig	2015-03-02 01:06:58.000000000 +0000
+--- src/AudacityApp.cpp.orig	2016-01-13 14:31:23.000000000 +0000
 +++ src/AudacityApp.cpp
-@@ -1096,7 +1096,7 @@ bool AudacityApp::OnInit()
-       * The "share" and "share/doc" directories in their install path */
-    #ifdef __WXGTK__
+@@ -1182,7 +1182,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().c_str());
 +   defaultTempDir.Printf(wxT("%s/.audacity1.2-%s"), home.c_str(), wxGetUserId().c_str());
diff --git a/audio/audacity/patches/patch-lib-src_FileDialog_Makefile.am b/audio/audacity/patches/patch-lib-src_FileDialog_Makefile.am
index 7cf92e7efdb..ba2683bf1be 100644
--- a/audio/audacity/patches/patch-lib-src_FileDialog_Makefile.am
+++ b/audio/audacity/patches/patch-lib-src_FileDialog_Makefile.am
@@ -1,15 +1,14 @@
-$NetBSD: patch-lib-src_FileDialog_Makefile.am,v 1.1 2015/09/18 21:19:07 mrg Exp $
+$NetBSD: patch-lib-src_FileDialog_Makefile.am,v 1.2 2016/06/05 01:02:38 ryoon Exp $
 
 don't build a shared library of this.
 
---- lib-src/FileDialog/Makefile.am.orig	2015-03-01 17:07:12.000000000 -0800
-+++ lib-src/FileDialog/Makefile.am	2015-09-18 11:28:47.000000000 -0700
-@@ -2,7 +2,7 @@
- 
- EXTRA_DIST = FileDialog.vcproj FileDialogPrivate.h.in
+--- lib-src/FileDialog/Makefile.am.orig	2016-01-13 14:31:17.000000000 +0000
++++ lib-src/FileDialog/Makefile.am
+@@ -1,6 +1,6 @@
+ ACLOCAL_AMFLAGS = -I m4
  
 -lib_LTLIBRARIES = libFileDialog.la
 +noinst_LTLIBRARIES = libFileDialog.la
  
- libFileDialog_la_CPPFLAGS = $(WX_CXXFLAGS)
+ 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
new file mode 100644
index 00000000000..73f5ccc23b5
--- /dev/null
+++ b/audio/audacity/patches/patch-lib-src_FileDialog_Makefile.in
@@ -0,0 +1,302 @@
+$NetBSD: patch-lib-src_FileDialog_Makefile.in,v 1.1 2016/06/05 01:02:38 ryoon Exp $
+
+* Do not build shared library
+* Fix libtool tag issue
+
+--- lib-src/FileDialog/Makefile.in.orig	2016-01-13 14:36:43.000000000 +0000
++++ lib-src/FileDialog/Makefile.in
+@@ -1,7 +1,7 @@
+-# Makefile.in generated by automake 1.14.1 from Makefile.am.
++# Makefile.in generated by automake 1.15 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
++# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+ 
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -15,7 +15,17 @@
+ @SET_MAKE@
+ 
+ VPATH = @srcdir@
+-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
++am__is_gnu_make = { \
++  if test -z '$(MAKELEVEL)'; then \
++    false; \
++  elif test -n '$(MAKE_HOST)'; then \
++    true; \
++  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
++    true; \
++  else \
++    false; \
++  fi; \
++}
+ am__make_running_with_option = \
+   case $${target_option-} in \
+       ?) ;; \
+@@ -94,18 +104,6 @@ host_triplet = @host@
+ @WINDOWS_TRUE@									 $(NULL)
+ 
+ subdir = .
+-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+-	$(top_srcdir)/configure $(am__configure_deps) \
+-	$(top_srcdir)/autotools/depcomp autotools/ar-lib \
+-	autotools/compile autotools/config.guess autotools/config.sub \
+-	autotools/depcomp autotools/install-sh autotools/missing \
+-	autotools/ltmain.sh $(top_srcdir)/autotools/ar-lib \
+-	$(top_srcdir)/autotools/compile \
+-	$(top_srcdir)/autotools/config.guess \
+-	$(top_srcdir)/autotools/config.sub \
+-	$(top_srcdir)/autotools/install-sh \
+-	$(top_srcdir)/autotools/ltmain.sh \
+-	$(top_srcdir)/autotools/missing
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+ 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+@@ -113,40 +111,14 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/l
+ 	$(top_srcdir)/configure.ac
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ 	$(ACLOCAL_M4)
++DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
++	$(am__configure_deps) $(am__DIST_COMMON)
+ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+  configure.lineno config.status.lineno
+ mkinstalldirs = $(install_sh) -d
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+-    *) f=$$p;; \
+-  esac;
+-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+-am__install_max = 40
+-am__nobase_strip_setup = \
+-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+-am__nobase_strip = \
+-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+-am__nobase_list = $(am__nobase_strip_setup); \
+-  for p in $$list; do echo "$$p $$p"; done | \
+-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+-    if (++n[$$2] == $(am__install_max)) \
+-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+-    END { for (dir in files) print dir, files[dir] }'
+-am__base_list = \
+-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+-am__uninstall_files_from_dir = { \
+-  test -z "$$files" \
+-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+-         $(am__cd) "$$dir" && rm -f $$files; }; \
+-  }
+-am__installdirs = "$(DESTDIR)$(libdir)"
+-LTLIBRARIES = $(lib_LTLIBRARIES)
++LTLIBRARIES = $(noinst_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+ @GTK_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
+ libFileDialog_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+@@ -213,7 +185,7 @@ am__v_OBJCXX_0 = @echo "  OBJCXX  " $@;
+ am__v_OBJCXX_1 = 
+ OBJCXXLD = $(OBJCXX)
+ OBJCXXLINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+-	--mode=link $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
++	--tag=CXX --mode=link $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_OBJCXXLD = $(am__v_OBJCXXLD_@AM_V@)
+ am__v_OBJCXXLD_ = $(am__v_OBJCXXLD_@AM_DEFAULT_V@)
+@@ -265,6 +237,17 @@ ETAGS = etags
+ CTAGS = ctags
+ CSCOPE = cscope
+ AM_RECURSIVE_TARGETS = cscope
++am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/autotools/ar-lib \
++	$(top_srcdir)/autotools/compile \
++	$(top_srcdir)/autotools/config.guess \
++	$(top_srcdir)/autotools/config.sub \
++	$(top_srcdir)/autotools/depcomp \
++	$(top_srcdir)/autotools/install-sh \
++	$(top_srcdir)/autotools/ltmain.sh \
++	$(top_srcdir)/autotools/missing autotools/ar-lib \
++	autotools/compile autotools/config.guess autotools/config.sub \
++	autotools/depcomp autotools/install-sh autotools/ltmain.sh \
++	autotools/missing
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ distdir = $(PACKAGE)-$(VERSION)
+ top_distdir = $(distdir)
+@@ -416,7 +399,7 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ ACLOCAL_AMFLAGS = -I m4
+-lib_LTLIBRARIES = libFileDialog.la
++noinst_LTLIBRARIES = libFileDialog.la
+ libFileDialog_la_CPPFLAGS = $(WX_CXXFLAGS) \
+ 	-Wno-deprecated-declarations $(am__append_1)
+ libFileDialog_la_LIBADD = $(WX_LIBS) $(am__append_2)
+@@ -441,7 +424,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+ 	  $(AUTOMAKE) --foreign Makefile
+-.PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+ 	  *config.status*) \
+@@ -461,33 +443,9 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(
+ 	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+ $(am__aclocal_m4_deps):
+ 
+-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+-	@$(NORMAL_INSTALL)
+-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+-	list2=; for p in $$list; do \
+-	  if test -f $$p; then \
+-	    list2="$$list2 $$p"; \
+-	  else :; fi; \
+-	done; \
+-	test -z "$$list2" || { \
+-	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+-	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
+-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+-	}
+-
+-uninstall-libLTLIBRARIES:
+-	@$(NORMAL_UNINSTALL)
+-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+-	for p in $$list; do \
+-	  $(am__strip_dir) \
+-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
+-	done
+-
+-clean-libLTLIBRARIES:
+-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+-	@list='$(lib_LTLIBRARIES)'; \
++clean-noinstLTLIBRARIES:
++	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
++	@list='$(noinst_LTLIBRARIES)'; \
+ 	locs=`for p in $$list; do echo $$p; done | \
+ 	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ 	      sort -u`; \
+@@ -521,7 +479,7 @@ win/libFileDialog_la-FileDialogPrivate.l
+ 	win/$(DEPDIR)/$(am__dirstamp)
+ 
+ libFileDialog.la: $(libFileDialog_la_OBJECTS) $(libFileDialog_la_DEPENDENCIES) $(EXTRA_libFileDialog_la_DEPENDENCIES) 
+-	$(AM_V_OBJCXXLD)$(OBJCXXLINK) -rpath $(libdir) $(libFileDialog_la_OBJECTS) $(libFileDialog_la_LIBADD) $(LIBS)
++	$(AM_V_OBJCXXLD)$(OBJCXXLINK)  $(libFileDialog_la_OBJECTS) $(libFileDialog_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -742,15 +700,15 @@ dist-xz: distdir
+ 	$(am__post_remove_distdir)
+ 
+ dist-tarZ: distdir
+-	@echo WARNING: "Support for shar distribution archives is" \
+-	               "deprecated." >&2
++	@echo WARNING: "Support for distribution archives compressed with" \
++		       "legacy program 'compress' is deprecated." >&2
+ 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
+ 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+ 	$(am__post_remove_distdir)
+ 
+ dist-shar: distdir
+-	@echo WARNING: "Support for distribution archives compressed with" \
+-		       "legacy program 'compress' is deprecated." >&2
++	@echo WARNING: "Support for shar distribution archives is" \
++	               "deprecated." >&2
+ 	@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)
+@@ -786,17 +744,17 @@ distcheck: dist
+ 	esac
+ 	chmod -R a-w $(distdir)
+ 	chmod u+w $(distdir)
+-	mkdir $(distdir)/_build $(distdir)/_inst
++	mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
+ 	chmod a-w $(distdir)
+ 	test -d $(distdir)/_build || exit 0; \
+ 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+ 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+ 	  && am__cwd=`pwd` \
+-	  && $(am__cd) $(distdir)/_build \
+-	  && ../configure \
++	  && $(am__cd) $(distdir)/_build/sub \
++	  && ../../configure \
+ 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
+ 	    $(DISTCHECK_CONFIGURE_FLAGS) \
+-	    --srcdir=.. --prefix="$$dc_install_base" \
++	    --srcdir=../.. --prefix="$$dc_install_base" \
+ 	  && $(MAKE) $(AM_MAKEFLAGS) \
+ 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+ 	  && $(MAKE) $(AM_MAKEFLAGS) check \
+@@ -853,9 +811,6 @@ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES)
+ installdirs:
+-	for dir in "$(DESTDIR)$(libdir)"; do \
+-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+-	done
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -894,7 +849,7 @@ maintainer-clean-generic:
+ 	@echo "it deletes files that may require special tools to rebuild."
+ clean: clean-am
+ 
+-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
++clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+ 	mostlyclean-am
+ 
+ distclean: distclean-am
+@@ -922,7 +877,7 @@ install-dvi: install-dvi-am
+ 
+ install-dvi-am:
+ 
+-install-exec-am: install-libLTLIBRARIES
++install-exec-am:
+ 
+ install-html: install-html-am
+ 
+@@ -964,26 +919,28 @@ ps: ps-am
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-libLTLIBRARIES
++uninstall-am:
+ 
+ .MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-am clean \
+-	clean-cscope clean-generic clean-libLTLIBRARIES clean-libtool \
+-	cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
+-	dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
+-	distcheck distclean distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags distcleancheck distdir \
+-	distuninstallcheck dvi dvi-am html html-am info info-am \
+-	install install-am install-data install-data-am install-dvi \
+-	install-dvi-am install-exec install-exec-am install-html \
+-	install-html-am install-info install-info-am \
+-	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+-	install-ps install-ps-am install-strip installcheck \
+-	installcheck-am installdirs maintainer-clean \
++	clean-cscope clean-generic clean-libtool \
++	clean-noinstLTLIBRARIES cscope cscopelist-am ctags ctags-am \
++	dist dist-all dist-bzip2 dist-gzip dist-lzip dist-shar \
++	dist-tarZ dist-xz dist-zip distcheck distclean \
++	distclean-compile distclean-generic distclean-libtool \
++	distclean-tags distcleancheck distdir distuninstallcheck dvi \
++	dvi-am html html-am info info-am install install-am \
++	install-data install-data-am install-dvi install-dvi-am \
++	install-exec install-exec-am install-html install-html-am \
++	install-info install-info-am install-man install-pdf \
++	install-pdf-am install-ps install-ps-am install-strip \
++	installcheck installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES
++	tags tags-am uninstall uninstall-am
++
++.PRECIOUS: Makefile
+ 
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/audio/audacity/patches/patch-lib-src_lib-widget-extra_Makefile.am b/audio/audacity/patches/patch-lib-src_lib-widget-extra_Makefile.am
index df8d1e4ba43..7fcbb18135c 100644
--- a/audio/audacity/patches/patch-lib-src_lib-widget-extra_Makefile.am
+++ b/audio/audacity/patches/patch-lib-src_lib-widget-extra_Makefile.am
@@ -1,15 +1,15 @@
-$NetBSD: patch-lib-src_lib-widget-extra_Makefile.am,v 1.1 2015/09/18 21:19:07 mrg Exp $
+$NetBSD: patch-lib-src_lib-widget-extra_Makefile.am,v 1.2 2016/06/05 01:02:39 ryoon Exp $
 
 don't build a shared library of this.
 
---- lib-src/lib-widget-extra/Makefile.am.orig	2015-03-01 17:07:17.000000000 -0800
-+++ lib-src/lib-widget-extra/Makefile.am	2015-09-18 11:29:29.000000000 -0700
-@@ -5,7 +5,7 @@
+--- lib-src/lib-widget-extra/Makefile.am.orig	2016-01-13 14:31:17.000000000 +0000
++++ lib-src/lib-widget-extra/Makefile.am
+@@ -5,7 +5,7 @@ EXTRA_DIST = libwidgetextra.pc.in
  pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA = libwidgetextra.pc
  
 -lib_LTLIBRARIES = libwidgetextra.la
 +noinst_LTLIBRARIES = libwidgetextra.la
  
- libwidgetextra_la_CPPFLAGS = $(WX_CXXFLAGS)
+ libwidgetextra_la_CPPFLAGS = $(WX_CXXFLAGS) -Wno-deprecated-declarations
  libwidgetextra_la_LIBADD = $(WX_LIBS)
diff --git a/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_ffts_src_fftlib.c b/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_ffts_src_fftlib.c
deleted file mode 100644
index 6df268b0daa..00000000000
--- a/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_ffts_src_fftlib.c
+++ /dev/null
@@ -1,268 +0,0 @@
-$NetBSD: patch-lib-src_libnyquist_nyquist_ffts_src_fftlib.c,v 1.1 2015/04/27 23:50:39 joerg Exp $
-
---- lib-src/libnyquist/nyquist/ffts/src/fftlib.c.orig	2015-03-02 01:07:22.000000000 +0000
-+++ lib-src/libnyquist/nyquist/ffts/src/fftlib.c
-@@ -61,8 +61,8 @@ for (i1 = 0; i1 < Nroot_1; i1++){
- parts of ffts1
- *************************************************/
- 
--inline void bitrevR2(float *ioptr, long M, short *BRLow);
--inline void bitrevR2(float *ioptr, long M, short *BRLow){
-+void bitrevR2(float *ioptr, long M, short *BRLow);
-+void bitrevR2(float *ioptr, long M, short *BRLow){
- /*** bit reverse and first radix 2 stage of forward or inverse fft ***/
- float	f0r;
- float	f0i;
-@@ -198,8 +198,8 @@ for (; ioptr < iolimit; ioptr += POW2(M/
- };
- }
- 
--inline void fft2pt(float *ioptr);
--inline void fft2pt(float *ioptr){
-+void fft2pt(float *ioptr);
-+void fft2pt(float *ioptr){
- /***   RADIX 2 fft	***/
- float f0r, f0i, f1r, f1i;
- float t0r, t0i;
-@@ -229,8 +229,8 @@ ioptr[3] = f1i;
- }
- 
- 
--inline void fft4pt(float *ioptr);
--inline void fft4pt(float *ioptr){
-+void fft4pt(float *ioptr);
-+void fft4pt(float *ioptr){
- /***   RADIX 4 fft	***/
- float f0r, f0i, f1r, f1i, f2r, f2i, f3r, f3i;
- float t0r, t0i, t1r, t1i;
-@@ -284,8 +284,8 @@ ioptr[6] = f3r;
- ioptr[7] = f3i;
- }
- 
--inline void fft8pt(float *ioptr);
--inline void fft8pt(float *ioptr){
-+void fft8pt(float *ioptr);
-+void fft8pt(float *ioptr){
- /***   RADIX 8 fft	***/
- float w0r = 1.0/MYROOT2; /* cos(pi/4)	*/
- float f0r, f0i, f1r, f1i, f2r, f2i, f3r, f3i;
-@@ -403,8 +403,8 @@ ioptr[14] = f6r;
- ioptr[15] = f6i;
- }
- 
--inline void bfR2(float *ioptr, long M, long NDiffU);
--inline void bfR2(float *ioptr, long M, long NDiffU){
-+void bfR2(float *ioptr, long M, long NDiffU);
-+void bfR2(float *ioptr, long M, long NDiffU){
- /*** 2nd radix 2 stage ***/
- unsigned long	pos;
- unsigned long	posi;
-@@ -512,8 +512,8 @@ for (SameUCnt = NSameU; SameUCnt > 0 ; S
- }
- }
- 
--inline void bfR4(float *ioptr, long M, long NDiffU);
--inline void bfR4(float *ioptr, long M, long NDiffU){
-+void bfR4(float *ioptr, long M, long NDiffU);
-+void bfR4(float *ioptr, long M, long NDiffU){
- /*** 1 radix 4 stage ***/
- unsigned long	pos;
- unsigned long	posi;
-@@ -721,8 +721,8 @@ f4i = f4i * Two - f6i;
- 
- }
- 
--inline void bfstages(float *ioptr, long M, float *Utbl, long Ustride, long NDiffU, long StageCnt);
--inline void bfstages(float *ioptr, long M, float *Utbl, long Ustride, long NDiffU, long StageCnt){
-+void bfstages(float *ioptr, long M, float *Utbl, long Ustride, long NDiffU, long StageCnt);
-+void bfstages(float *ioptr, long M, float *Utbl, long Ustride, long NDiffU, long StageCnt){
- /***   RADIX 8 Stages	***/
- unsigned long	pos;
- unsigned long	posi;
-@@ -1125,8 +1125,8 @@ default:
- parts of iffts1
- *************************************************/
- 
--inline void scbitrevR2(float *ioptr, long M, short *BRLow, float scale);
--inline void scbitrevR2(float *ioptr, long M, short *BRLow, float scale){
-+void scbitrevR2(float *ioptr, long M, short *BRLow, float scale);
-+void scbitrevR2(float *ioptr, long M, short *BRLow, float scale){
- /*** scaled bit reverse and first radix 2 stage forward or inverse fft ***/
- float	f0r;
- float	f0i;
-@@ -1262,8 +1262,8 @@ for (; ioptr < iolimit; ioptr += POW2(M/
- };
- }
- 
--inline void ifft2pt(float *ioptr, float scale);
--inline void ifft2pt(float *ioptr, float scale){
-+void ifft2pt(float *ioptr, float scale);
-+void ifft2pt(float *ioptr, float scale){
- /***   RADIX 2 ifft	***/
- float f0r, f0i, f1r, f1i;
- float t0r, t0i;
-@@ -1292,8 +1292,8 @@ ioptr[2] = scale*f1r;
- ioptr[3] = scale*f1i;
- }
- 
--inline void ifft4pt(float *ioptr, float scale);
--inline void ifft4pt(float *ioptr, float scale){
-+void ifft4pt(float *ioptr, float scale);
-+void ifft4pt(float *ioptr, float scale){
- /***   RADIX 4 ifft	***/
- float f0r, f0i, f1r, f1i, f2r, f2i, f3r, f3i;
- float t0r, t0i, t1r, t1i;
-@@ -1347,8 +1347,8 @@ ioptr[6] = scale*f3r;
- ioptr[7] = scale*f3i;
- }
- 
--inline void ifft8pt(float *ioptr, float scale);
--inline void ifft8pt(float *ioptr, float scale){
-+void ifft8pt(float *ioptr, float scale);
-+void ifft8pt(float *ioptr, float scale){
- /***   RADIX 8 ifft	***/
- float w0r = 1.0/MYROOT2; /* cos(pi/4)	*/
- float f0r, f0i, f1r, f1i, f2r, f2i, f3r, f3i;
-@@ -1467,8 +1467,8 @@ ioptr[14] = scale*f6r;
- ioptr[15] = scale*f6i;
- }
- 
--inline void ibfR2(float *ioptr, long M, long NDiffU);
--inline void ibfR2(float *ioptr, long M, long NDiffU){
-+void ibfR2(float *ioptr, long M, long NDiffU);
-+void ibfR2(float *ioptr, long M, long NDiffU){
- /*** 2nd radix 2 stage ***/
- unsigned long	pos;
- unsigned long	posi;
-@@ -1576,8 +1576,8 @@ for (SameUCnt = NSameU; SameUCnt > 0 ; S
- }
- }
- 
--inline void ibfR4(float *ioptr, long M, long NDiffU);
--inline void ibfR4(float *ioptr, long M, long NDiffU){
-+void ibfR4(float *ioptr, long M, long NDiffU);
-+void ibfR4(float *ioptr, long M, long NDiffU){
- /*** 1 radix 4 stage ***/
- unsigned long	pos;
- unsigned long	posi;
-@@ -1785,8 +1785,8 @@ f4i = f4i * Two - f6i;
- 
- }
- 
--inline void ibfstages(float *ioptr, long M, float *Utbl, long Ustride, long NDiffU, long StageCnt);
--inline void ibfstages(float *ioptr, long M, float *Utbl, long Ustride, long NDiffU, long StageCnt){
-+void ibfstages(float *ioptr, long M, float *Utbl, long Ustride, long NDiffU, long StageCnt);
-+void ibfstages(float *ioptr, long M, float *Utbl, long Ustride, long NDiffU, long StageCnt){
- /***   RADIX 8 Stages	***/
- unsigned long	pos;
- unsigned long	posi;
-@@ -2193,8 +2193,8 @@ default:
- parts of rffts1
- *************************************************/
- 
--inline void rfft1pt(float *ioptr);
--inline void rfft1pt(float *ioptr){
-+void rfft1pt(float *ioptr);
-+void rfft1pt(float *ioptr){
- /***   RADIX 2 rfft	***/
- float f0r, f0i;
- float t0r, t0i;
-@@ -2212,8 +2212,8 @@ ioptr[0] = t0r;
- ioptr[1] = t0i;
- }
- 
--inline void rfft2pt(float *ioptr);
--inline void rfft2pt(float *ioptr){
-+void rfft2pt(float *ioptr);
-+void rfft2pt(float *ioptr){
- /***   RADIX 4 rfft	***/
- float f0r, f0i, f1r, f1i;
- float t0r, t0i;
-@@ -2245,8 +2245,8 @@ ioptr[2] = f1r;
- ioptr[3] = f1i;
- }
- 
--inline void rfft4pt(float *ioptr);
--inline void rfft4pt(float *ioptr){
-+void rfft4pt(float *ioptr);
-+void rfft4pt(float *ioptr){
- /***   RADIX 8 rfft	***/
- float f0r, f0i, f1r, f1i, f2r, f2i, f3r, f3i;
- float t0r, t0i, t1r, t1i;
-@@ -2318,8 +2318,8 @@ ioptr[6] = scale*f3r;
- ioptr[7] = scale*f3i;
- }
- 
--inline void rfft8pt(float *ioptr);
--inline void rfft8pt(float *ioptr){
-+void rfft8pt(float *ioptr);
-+void rfft8pt(float *ioptr){
- /***   RADIX 16 rfft	***/
- float w0r = 1.0/MYROOT2; /* cos(pi/4)	*/
- float w1r = MYCOSPID8; /* cos(pi/8)	*/
-@@ -2477,8 +2477,8 @@ ioptr[14] = scale*f6r;
- ioptr[15] = scale*f6i;
- }
- 
--inline void frstage(float *ioptr, long M, float *Utbl);
--inline void frstage(float *ioptr, long M, float *Utbl){
-+void frstage(float *ioptr, long M, float *Utbl);
-+void frstage(float *ioptr, long M, float *Utbl){
- /*	Finish RFFT		*/
- 
- unsigned long 	pos;
-@@ -2687,8 +2687,8 @@ default:
- parts of riffts1
- *************************************************/
- 
--inline void rifft1pt(float *ioptr, float scale);
--inline void rifft1pt(float *ioptr, float scale){
-+void rifft1pt(float *ioptr, float scale);
-+void rifft1pt(float *ioptr, float scale){
- /***   RADIX 2 rifft	***/
- float f0r, f0i;
- float t0r, t0i;
-@@ -2706,8 +2706,8 @@ ioptr[0] = scale*t0r;
- ioptr[1] = scale*t0i;
- }
- 
--inline void rifft2pt(float *ioptr, float scale);
--inline void rifft2pt(float *ioptr, float scale){
-+void rifft2pt(float *ioptr, float scale);
-+void rifft2pt(float *ioptr, float scale){
- /***   RADIX 4 rifft	***/
- float f0r, f0i, f1r, f1i;
- float t0r, t0i;
-@@ -2740,8 +2740,8 @@ ioptr[2] = scale*f1r;
- ioptr[3] = scale*f1i;
- }
- 
--inline void rifft4pt(float *ioptr, float scale);
--inline void rifft4pt(float *ioptr, float scale){
-+void rifft4pt(float *ioptr, float scale);
-+void rifft4pt(float *ioptr, float scale){
- /***   RADIX 8 rifft	***/
- float f0r, f0i, f1r, f1i, f2r, f2i, f3r, f3i;
- float t0r, t0i, t1r, t1i;
-@@ -2811,8 +2811,8 @@ ioptr[6] = scale*f3r;
- ioptr[7] = scale*f3i;
- }
- 
--inline void rifft8pt(float *ioptr, float scale);
--inline void rifft8pt(float *ioptr, float scale){
-+void rifft8pt(float *ioptr, float scale);
-+void rifft8pt(float *ioptr, float scale){
- /***   RADIX 16 rifft	***/
- float w0r = 1.0/MYROOT2; /* cos(pi/4)	*/
- float w1r = MYCOSPID8; /* cos(pi/8)	*/
-@@ -2968,8 +2968,8 @@ ioptr[14] = scale*f6r;
- ioptr[15] = scale*f6i;
- }
- 
--inline void ifrstage(float *ioptr, long M, float *Utbl);
--inline void ifrstage(float *ioptr, long M, float *Utbl){
-+void ifrstage(float *ioptr, long M, float *Utbl);
-+void ifrstage(float *ioptr, long M, float *Utbl){
- /*	Start RIFFT		*/
- 
- unsigned long 	pos;
diff --git a/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_nyqsrc_sndread.c b/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_nyqsrc_sndread.c
index d23f5435fbe..3af6c083b8c 100644
--- a/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_nyqsrc_sndread.c
+++ b/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_nyqsrc_sndread.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-lib-src_libnyquist_nyquist_nyqsrc_sndread.c,v 1.1 2015/04/21 01:33:39 rodent Exp $
+$NetBSD: patch-lib-src_libnyquist_nyquist_nyqsrc_sndread.c,v 1.2 2016/06/05 01:02:39 ryoon Exp $
 
 Fixes "error: invalid operands to binary" build failure.
 
---- lib-src/libnyquist/nyquist/nyqsrc/sndread.c.orig	2015-03-02 01:07:21.000000000 +0000
+--- lib-src/libnyquist/nyquist/nyqsrc/sndread.c.orig	2016-01-13 14:31:18.000000000 +0000
 +++ lib-src/libnyquist/nyquist/nyqsrc/sndread.c
-@@ -166,7 +166,7 @@ LVAL snd_make_read(
+@@ -167,7 +167,7 @@ LVAL snd_make_read(
  #ifdef XL_BIG_ENDIAN
          long format = SF_ENDIAN_LITTLE;
  #endif
@@ -12,4 +12,4 @@ Fixes "error: invalid operands to binary" build failure.
 +        susp->sf_info.format |= (int) format;
      }
  
-     susp->sndfile = sf_open((const char *) filename, SFM_READ, 
+     susp->sndfile = NULL;
diff --git a/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_xlisp_xlfio.c b/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_xlisp_xlfio.c
deleted file mode 100644
index 313ea774975..00000000000
--- a/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_xlisp_xlfio.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-lib-src_libnyquist_nyquist_xlisp_xlfio.c,v 1.1 2015/04/21 01:33:39 rodent Exp $
-
-Fix #error directive.
-
---- lib-src/libnyquist/nyquist/xlisp/xlfio.c.orig	2015-03-02 01:07:22.000000000 +0000
-+++ lib-src/libnyquist/nyquist/xlisp/xlfio.c
-@@ -19,8 +19,7 @@
- /* do some sanity checking: */
- #ifndef XL_BIG_ENDIAN
- #ifndef XL_LITTLE_ENDIAN
--configuration error -- either XL_BIG_ or XL_LITTLE_ENDIAN must be defined
--in xlisp.h
-+#error configuration error -- either XL_BIG_ or XL_LITTLE_ENDIAN must be defined in xlisp.h
- #endif
- #endif
- #ifdef XL_BIG_ENDIAN
diff --git a/audio/audacity/patches/patch-src_FFmpeg.h b/audio/audacity/patches/patch-src_FFmpeg.h
new file mode 100644
index 00000000000..396e5fde5a0
--- /dev/null
+++ b/audio/audacity/patches/patch-src_FFmpeg.h
@@ -0,0 +1,33 @@
+$NetBSD: patch-src_FFmpeg.h,v 1.1 2016/06/05 01:02:39 ryoon Exp $
+
+* Fix build with ffmpeg 3
+
+--- src/FFmpeg.h.orig	2016-01-13 14:31:24.000000000 +0000
++++ src/FFmpeg.h
+@@ -689,7 +689,7 @@ extern "C" {
+    FFMPEG_FUNCTION_WITH_RETURN(
+       AVOutputFormat*,
+       av_oformat_next,
+-      (AVOutputFormat *f),
++      (const AVOutputFormat *f),
+       (f)
+    );
+    FFMPEG_FUNCTION_WITH_RETURN(
+@@ -756,7 +756,7 @@ extern "C" {
+    FFMPEG_FUNCTION_WITH_RETURN(
+       int,
+       av_fifo_size,
+-      (AVFifoBuffer *f),
++      (const AVFifoBuffer *f),
+       (f)
+    );
+    FFMPEG_FUNCTION_WITH_RETURN(
+@@ -802,7 +802,7 @@ extern "C" {
+    FFMPEG_FUNCTION_WITH_RETURN(
+       AVDictionaryEntry *,
+       av_dict_get,
+-      (AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags),
++      (const AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags),
+       (m, key, prev, flags)
+    );
+    FFMPEG_FUNCTION_WITH_RETURN(