Index: audio/audacity/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/audio/audacity/distinfo,v
retrieving revision 1.33
diff -p -u -u -r1.33 distinfo
--- audio/audacity/distinfo	16 Jul 2016 01:32:51 -0000	1.33
+++ audio/audacity/distinfo	7 Feb 2018 20:04:43 -0000
@@ -19,5 +19,7 @@ SHA1 (patch-lib-src_sbsms_src-extra_Make
 SHA1 (patch-src_FFmpeg.h) = 664efb8a668a9dd5f76704e5a46c495a8c2c3a4d
 SHA1 (patch-src_effects_NoiseRemoval.cpp) = 6d72545cde66ac90d4eb3821a3a3f384ccbf46f2
 SHA1 (patch-src_effects_VST_VSTEffect.cpp) = 76a55afd7977505801dd129e139c9782bfd8dfcb
+SHA1 (patch-src_effects_lv2_LV2Effect.cpp) = 88972bb870f9aa1018337a6e2e4042827f3c6e7f
+SHA1 (patch-src_effects_nyquist_Nyquist.cpp) = 1a931e9287960a43f862bbfa2c6fc8ee535a4bec
 SHA1 (patch-src_effects_vamp_LoadVamp.cpp) = 5e57289e99d8ac5323b869138d13b67b5ad8a3d6
 SHA1 (patch-src_import_ImportFLAC.cpp) = 9064b5f24cfd837d9a5d5bb74450bcfd0096b099
Index: audio/audacity/patches/patch-src_effects_lv2_LV2Effect.cpp
===================================================================
RCS file: audio/audacity/patches/patch-src_effects_lv2_LV2Effect.cpp
diff -N audio/audacity/patches/patch-src_effects_lv2_LV2Effect.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ audio/audacity/patches/patch-src_effects_lv2_LV2Effect.cpp	7 Feb 2018 20:04:43 -0000
@@ -0,0 +1,23 @@
+$NetBSD$
+
+GCC 6 wants std namespace, found via <cmath>.
+
+--- src/effects/lv2/LV2Effect.cpp.orig	2016-01-13 14:31:24.000000000 +0000
++++ src/effects/lv2/LV2Effect.cpp	2018-02-07 10:20:15.597051982 +0000
+@@ -562,13 +562,13 @@
+       lilv_scale_points_free(points);
+ 
+       // Collect the value and range info
+-      ctrl.mHasLo = !isnan(minimumVals[i]);
+-      ctrl.mHasHi = !isnan(maximumVals[i]);
++      ctrl.mHasLo = !std::isnan(minimumVals[i]);
++      ctrl.mHasHi = !std::isnan(maximumVals[i]);
+       ctrl.mMin = ctrl.mHasLo ? minimumVals[i] : 0.0;
+       ctrl.mMax = ctrl.mHasHi ? maximumVals[i] : 1.0;
+       ctrl.mLo = ctrl.mMin;
+       ctrl.mHi = ctrl.mMax;
+-      ctrl.mDef = !isnan(defaultValues[i]) ?
++      ctrl.mDef = !std::isnan(defaultValues[i]) ?
+                   defaultValues[i] :
+                      ctrl.mHasLo ?
+                      ctrl.mLo :
Index: audio/audacity/patches/patch-src_effects_nyquist_Nyquist.cpp
===================================================================
RCS file: audio/audacity/patches/patch-src_effects_nyquist_Nyquist.cpp
diff -N audio/audacity/patches/patch-src_effects_nyquist_Nyquist.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ audio/audacity/patches/patch-src_effects_nyquist_Nyquist.cpp	7 Feb 2018 20:04:43 -0000
@@ -0,0 +1,15 @@
+$NetBSD$
+
+GCC 6 wants std namespace, found via <cmath>.
+
+--- src/effects/nyquist/Nyquist.cpp.orig	2018-02-07 10:04:58.228319803 +0000
++++ src/effects/nyquist/Nyquist.cpp	2018-02-07 10:14:46.346004080 +0000
+@@ -666,7 +666,7 @@
+                // with very small values, bandwidth calculation may be inf.
+                // (Observed on Linux)
+                double bw = log(mF1 / mF0) / log(2.0);
+-               if (!isinf(bw)) {
++               if (!std::isinf(bw)) {
+                   bandwidth.Printf(wxT("(float %s)"), Internat::ToString(bw).c_str());
+                }
+             }
Index: multimedia/smpeg2/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/smpeg2/distinfo,v
retrieving revision 1.2
diff -p -u -u -r1.2 distinfo
--- multimedia/smpeg2/distinfo	3 Nov 2015 23:54:32 -0000	1.2
+++ multimedia/smpeg2/distinfo	7 Feb 2018 20:04:43 -0000
@@ -4,3 +4,4 @@ SHA1 (smpeg2-2.0.0.tar.gz) = d0455466f61
 RMD160 (smpeg2-2.0.0.tar.gz) = 6c175111e38055d62064c6b6453d8c5e64945c09
 SHA512 (smpeg2-2.0.0.tar.gz) = 80a779d01e7aa76778ef6ceea8041537db9e4b354df413214c4413c875cb98551891cef98fa0f057cc6a3222e4983da9ae65b86bdad2f87f9e2a6751837e2baf
 Size (smpeg2-2.0.0.tar.gz) = 482322 bytes
+SHA1 (patch-audio_hufftable.cpp) = 20b8cf5f0491a7e50af14f526fc4d0b901b25499
Index: multimedia/smpeg2/patches/patch-audio_hufftable.cpp
===================================================================
RCS file: multimedia/smpeg2/patches/patch-audio_hufftable.cpp
diff -N multimedia/smpeg2/patches/patch-audio_hufftable.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ multimedia/smpeg2/patches/patch-audio_hufftable.cpp	7 Feb 2018 20:04:43 -0000
@@ -0,0 +1,29 @@
+$NetBSD$
+
+don't initialise unsigned with "0-1".
+
+--- audio/hufftable.cpp.orig	2013-06-01 15:19:04.000000000 +0000
++++ audio/hufftable.cpp	2018-02-07 11:40:46.545617490 +0000
+@@ -550,11 +550,11 @@
+ 
+ const HUFFMANCODETABLE MPEGaudio::ht[HTN]=
+ {
+-  { 0, 0-1, 0-1, 0,  0, htd33},
++  { 0, (unsigned)(0-1), (unsigned)(0-1), 0,  0, htd33},
+   { 1, 2-1, 2-1, 0,  7,htd01},
+   { 2, 3-1, 3-1, 0, 17,htd02},
+   { 3, 3-1, 3-1, 0, 17,htd03},
+-  { 4, 0-1, 0-1, 0,  0, htd33},
++  { 4, (unsigned)(0-1), (unsigned)(0-1), 0,  0, htd33},
+   { 5, 4-1, 4-1, 0, 31,htd05},
+   { 6, 4-1, 4-1, 0, 31,htd06},
+   { 7, 6-1, 6-1, 0, 71,htd07},
+@@ -564,7 +564,7 @@
+   {11, 8-1, 8-1, 0,127,htd11},
+   {12, 8-1, 8-1, 0,127,htd12},
+   {13,16-1,16-1, 0,511,htd13},
+-  {14, 0-1, 0-1, 0,  0, htd33},
++  {14, (unsigned)(0-1), (unsigned)(0-1), 0,  0, htd33},
+   {15,16-1,16-1, 0,511,htd15},
+   {16,16-1,16-1, 1,511,htd16},
+   {17,16-1,16-1, 2,511,htd16},