*/*: sync with upstream

Taken from: HardenedBSD
2020-06-22 10:27:14 +02:00 · 2020-06-22 10:27:14 +02:00 · 8ed126f8d6
parent f90785a974
commit 8ed126f8d6
2433 changed files with 46265 additions and 18342 deletions
--- a/archivers/kf5-karchive/distinfo
+++ b/archivers/kf5-karchive/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1588492985
-SHA256 (KDE/frameworks/5.70.0/karchive-5.70.0.tar.xz) = f5f361a2ce857d7e7af49276ab70506c6a2ece45a183971ed9abdd5386d50a7d
-SIZE (KDE/frameworks/5.70.0/karchive-5.70.0.tar.xz) = 987844
+TIMESTAMP = 1591513835
+SHA256 (KDE/frameworks/5.71.0/karchive-5.71.0.tar.xz) = cc81e856365dec2bcf3ec78aa01d42347ca390a2311ea12050f309dfbdb09624
+SIZE (KDE/frameworks/5.71.0/karchive-5.71.0.tar.xz) = 987808
--- a/archivers/py-zstd/Makefile
+++ b/archivers/py-zstd/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	zstd
-DISTVERSION=	1.4.1.0
+DISTVERSION=	1.4.5.1
 CATEGORIES=	archivers python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/archivers/py-zstd/distinfo
+++ b/archivers/py-zstd/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1567264470
-SHA256 (zstd-1.4.1.0.tar.gz) = 25a969d339b50c102958e2fd7451b2570422c6920175f22aae7f85a72e785d51
-SIZE (zstd-1.4.1.0.tar.gz) = 454482
+TIMESTAMP = 1592546883
+SHA256 (zstd-1.4.5.1.tar.gz) = 2a1806d625bd2d8944ead4b3018fc6444a31467fa09935e9c1d4296275f024c6
+SIZE (zstd-1.4.5.1.tar.gz) = 483105
--- a/astro/mkgmap/Makefile
+++ b/astro/mkgmap/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	mkgmap
-PORTVERSION=	r4525
+PORTVERSION=	r4550
 CATEGORIES=	astro converters java
 MASTER_SITES=	http://www.mkgmap.org.uk/download/ \
 		http://mirror.amdmi3.ru/distfiles/
--- a/astro/mkgmap/distinfo
+++ b/astro/mkgmap/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1591794038
-SHA256 (mkgmap-r4525.tar.gz) = 5c4997c9eb769e875f912c865ab6dd5d72a7e956ef7d01f66ca6413e767b95a3
-SIZE (mkgmap-r4525.tar.gz) = 3463467
+TIMESTAMP = 1592422700
+SHA256 (mkgmap-r4550.tar.gz) = a55cd3e0645eca2a7c120352c52d3c28fce761ac7a09e08cb817a22e2a2554b0
+SIZE (mkgmap-r4550.tar.gz) = 3465554
--- a/astro/py-metpy/Makefile
+++ b/astro/py-metpy/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	metpy
-PORTVERSION=	0.12.0
-PORTREVISION=	1
+PORTVERSION=	0.12.1
 CATEGORIES=	astro python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@ -19,11 +18,11 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=2.1.0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=0.22.0:math/py-pandas@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}Pint>=0.8:devel/py-Pint@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}Pint>=0.10.1:devel/py-Pint@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pooch>=0.1:devel/py-pooch@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}traitlets>=4.3.0:devel/py-traitlets@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}xarray>=0.10.7:devel/py-xarray@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}xarray>=0.13.0:devel/py-xarray@${PY_FLAVOR}

 USES=		python:3.6+
 USE_PYTHON=	autoplist distutils
--- a/astro/py-metpy/distinfo
+++ b/astro/py-metpy/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1578401130
-SHA256 (MetPy-0.12.0.tar.gz) = 4125fbbc2620e3702961fe012cb52bdaba5f609ec5f5458818617676044b7921
-SIZE (MetPy-0.12.0.tar.gz) = 5188288
+TIMESTAMP = 1592419263
+SHA256 (MetPy-0.12.1.tar.gz) = 2031007f12748c3aedad85694f71ffb3caf9933b72b5a330b59ea454285d0f50
+SIZE (MetPy-0.12.1.tar.gz) = 5197000
--- a/astro/qmapshack/Makefile
+++ b/astro/qmapshack/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	qmapshack
-PORTVERSION=	1.14.1
+PORTVERSION=	1.15.0
 DISTVERSIONPREFIX=	V_
 CATEGORIES=	astro

--- a/astro/qmapshack/distinfo
+++ b/astro/qmapshack/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1585556579
-SHA256 (Maproom-qmapshack-V_1.14.1_GH0.tar.gz) = 76f64185fc4620da6d9b71998edefcb9091eff1c3486626f87e4f30d444be623
-SIZE (Maproom-qmapshack-V_1.14.1_GH0.tar.gz) = 43586361
+TIMESTAMP = 1592229502
+SHA256 (Maproom-qmapshack-V_1.15.0_GH0.tar.gz) = a3a470657a66a21a59e812dd6f9351845ce3300c00c25622dcb4a3818ed884f2
+SIZE (Maproom-qmapshack-V_1.15.0_GH0.tar.gz) = 46097781
--- a/astro/weather/Makefile
+++ b/astro/weather/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	weather
-PORTVERSION=	2.3
-PORTREVISION=	1
+PORTVERSION=	2.4
 CATEGORIES=	astro python
 MASTER_SITES=	http://fungi.yuggoth.org/weather/src/ \
 		LOCAL/sunpoet
--- a/astro/weather/distinfo
+++ b/astro/weather/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1479551333
-SHA256 (weather-2.3.tar.xz) = 86148d2f1d59867f637f52558cc2a6b3280fac94df55c6e5af0ce37cc190d146
-SIZE (weather-2.3.tar.xz) = 7056760
+TIMESTAMP = 1592846026
+SHA256 (weather-2.4.tar.xz) = 6a5bac6110922b584ee635ddfce7594f8a3fea6b0b2763435bd641f6c9a4c420
+SIZE (weather-2.4.tar.xz) = 8343344
--- a/audio/Makefile
+++ b/audio/Makefile
@ -369,6 +369,7 @@
    SUBDIR += ladspa
    SUBDIR += lame
    SUBDIR += lash
+    SUBDIR += lenticular-lv2
    SUBDIR += liba52
    SUBDIR += libaacplus
    SUBDIR += libadplug
@ -450,6 +451,7 @@
    SUBDIR += linux-c7-alsa-utils
    SUBDIR += linux-c7-audiofile
    SUBDIR += linux-c7-flac
+    SUBDIR += linux-c7-gsm
    SUBDIR += linux-c7-libogg
    SUBDIR += linux-c7-libsndfile
    SUBDIR += linux-c7-libvorbis
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	audacity
-PORTVERSION=	2.3.3
-PORTREVISION=	2
+PORTVERSION=	2.4.1
 DISTVERSIONPREFIX=	Audacity-
 CATEGORIES=	audio

@ -13,131 +12,125 @@ COMMENT=	GUI editor for digital audio waveforms
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt

-BUILD_DEPENDS=	autogen:devel/autogen \
-		bash:shells/bash \
-		cmake:devel/cmake
 LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 		libexpat.so:textproc/expat2 \
 		libportaudio.so:audio/portaudio \
 		libsndfile.so:audio/libsndfile \
 		libsoxr.so:audio/libsoxr

-USES=		autoreconf compiler:c++11-lib cpe desktop-file-utils dos2unix \
-		gettext-tools gmake gnome iconv libtool localbase pkgconfig \
-		shared-mime-info shebangfix
+USES=		cmake compiler:c++11-lang cpe desktop-file-utils gettext \
+		gnome libtool python:build pkgconfig shared-mime-info
+USE_GITHUB=	yes
+USE_GNOME=	cairo gtk30
+USE_WX=		3.1+
+WX_COMPS=	wx
+INSTALLS_ICONS=	yes
+PORTDOCS=	README.txt

-GNU_CONFIGURE=		yes
-NLS_USES=		gettext-runtime
-NLS_CONFIGURE_ENABLE=	nls
-NLS_CONFIGURE_WITH=	libintl-prefix="${LOCALBASE}"
-OPTIONS_SUB=		yes
-USE_WX=			3.1+
-WX_COMPS=		wx
-INSTALLS_ICONS=		yes
-PORTDOCS=		README.txt
-DOS2UNIX_GLOB=		*.c* *.h Makefile.*
-SHEBANG_FILES=		lib-src/lv2/build
-USE_GITHUB=		yes
+CMAKE_ARGS=	-Daudacity_lib_preference:STRING=system \
+		-Daudacity_use_expat:STRING=system \
+		-Daudacity_use_wxwidgets:STRING=system \
+		-Daudacity_use_soxr:STRING=system \
+		-Daudacity_use_sndfile:STRING=system \
+		-Daudacity_use_portsmf:STRING=local \
+		-Daudacity_use_portmixer:STRING=local \
+		-Daudacity_use_portaudio:STRING=system

-OPTIONS_DEFINE=		DEBUG DOCS DYNLOAD FFMPEG FLAC ID3TAG LADSPA LAME LV2 \
-			MAD MOD_NYQ_BENCH MOD_SCRIPT_PIPE NLS SBSMS SOUNDTOUCH \
-			SSE TWOLAME VAMP VORBIS VST
-OPTIONS_DEFAULT=	FLAC ID3TAG LADSPA MAD SBSMS SOUNDTOUCH TWOLAME VAMP \
+OPTIONS_DEFINE=		DEBUG DOCS FFMPEG FLAC ID3TAG LADSPA LAME LV2 MAD \
+			MIDI NYQUIST OGG SBSMS SOUNDTOUCH TWOLAME VAMP \
 			VORBIS VST
+OPTIONS_DEFAULT=	FLAC ID3TAG LADSPA MAD MIDI NYQUIST OGG SBSMS \
+			SOUNDTOUCH TWOLAME VAMP VORBIS VST

-OPTIONS_DEFAULT_amd64=	SSE
-OPTIONS_DEFAULT_i386=	${MACHINE_CPU:tu:MSSE}
-
-DYNLOAD_DESC=		Enable dynamic loading of lame and FFmpeg
 LAME_DESC=		Use lame for import and export support
 LV2_DESC=		Add LV2 plug-in support
 MAD_DESC=		Use libmad for mp2/3 decoding support
-MOD_SCRIPT_PIPE_DESC=	mod-script-pipe scripting support
-MOD_NYQ_BENCH_DESC=	Enable Nyquist Workbench
+MIDI_DESC=		MIDI support
+NYQUIST_DESC=		Nyquist synthesis and composition support
 SBSMS_DESC=		Use libsbsms for pitch and tempo changing
 SOUNDTOUCH_DESC=	Use libSoundTouch for pitch and tempo changing
 TWOLAME_DESC=		Use libtwolame for MP2 export support
 VAMP_DESC=		Vamp plug-in support
 VST_DESC=		VST plug-in support

-CONFIGURE_ENV+=	WX_CONFIG="${WX_CONFIG}"
-
-CONFIGURE_ARGS+=	${ICONV_CONFIGURE_ARG} \
-			--disable-option-checking \
-			--enable-unicode \
-			--with-expat=system \
-			--with-lib-preference="local" \
-			--with-libsndfile=system \
-			--with-libsoxr=system \
-			--with-midi \
-			--with-portaudio=system \
-			--with-portmixer=yes \
-			--with-widgetextra
-
-CONFIGURE_SHELL?=	${LOCALBASE}/bin/bash
-
-DEBUG_CONFIGURE_WITH=	debug
+DEBUG_CMAKE_ON=		wxWidgets_USE_DEBUG

 DOCS_BUILD_DEPENDS=	docbook-to-man:textproc/docbook-to-man \
 			docbook2man:textproc/docbook-utils

-DYNLOAD_BUILD_DEPENDS=		${LOCALBASE}/include/lame/lame.h:audio/lame \
-				${LOCALBASE}/libdata/pkgconfig/libavcodec.pc:multimedia/ffmpeg
-DYNLOAD_CONFIGURE_ENABLE=	dynamic-loading
-# for audio/lame
-DYNLOAD_CPPFLAGS=		-I${LOCALBASE}/include
-# for audio/lame
-DYNLOAD_LDFLAGS=		-L${LOCALBASE}/lib
-
-FFMPEG_CONFIGURE_WITH=	ffmpeg=system
+FFMPEG_CMAKE_ON=	-Daudacity_use_ffmpeg:STRING=loaded
+FFMPEG_CMAKE_OFF=	-Daudacity_use_ffmpeg:STRING=off
+FFMPEG_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/libavcodec.pc:multimedia/ffmpeg
 FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg

-FLAC_CONFIGURE_WITH=	libflac=system
+FLAC_CMAKE_ON=		-Daudacity_use_flac:STRING=system
+FLAC_CMAKE_OFF=		-Daudacity_use_flac:STRING=local
 FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac

-ID3TAG_CONFIGURE_WITH=	libid3tag=system
+ID3TAG_CMAKE_ON=	-Daudacity_use_id3tag:STRING=system
+ID3TAG_CMAKE_OFF=	-Daudacity_use_id3tag:STRING=off
 ID3TAG_LIB_DEPENDS=	libid3tag.so:audio/libid3tag

-LADSPA_CONFIGURE_ENABLE=	ladspa
-LADSPA_RUN_DEPENDS=		listplugins:audio/ladspa
+LADSPA_CMAKE_BOOL=	audacity_use_ladspa
+LADSPA_RUN_DEPENDS=	listplugins:audio/ladspa

-LAME_CONFIGURE_ON=	--with-lame=system
-# --without-lame is broken
-LAME_CONFIGURE_OFF=	--with-lame
-LAME_CPPFLAGS=		-I${LOCALBASE}/include
+LAME_CMAKE_ON=		-Daudacity_use_lame:STRING=system
+LAME_CMAKE_OFF=		-Daudacity_use_lame:STRING=local
+LAME_BUILD_DEPENDS=	${LOCALBASE}/include/lame/lame.h:audio/lame
+LAME_CPPFLAGS=		-I${LOCALBASE}/include/lame
 LAME_LDFLAGS=		-L${LOCALBASE}/lib
 LAME_LIB_DEPENDS=	libmp3lame.so:audio/lame

-LV2_CONFIGURE_WITH=	lv2=system
+LV2_CMAKE_ON=		-Daudacity_use_lv2:STRING=system
+LV2_CMAKE_OFF=		-Daudacity_use_lv2:STRING=off
 LV2_LIB_DEPENDS=	liblilv-0.so:audio/lilv \
+			libserd-0.so:devel/serd \
+			libsord-0.so:devel/sord \
+			libsratom-0.so:audio/sratom \
 			libsuil-0.so:audio/suil

-MAD_CONFIGURE_WITH=	libmad=system
+MAD_CMAKE_ON=		-Daudacity_use_mad:STRING=system
+MAD_CMAKE_OFF=		-Daudacity_use_mad:STRING=off
 MAD_LIB_DEPENDS=	libmad.so:audio/libmad

-MOD_SCRIPT_PIPE_CONFIGURE_WITH=	mod-script-pipe
-MOD_SCRIPT_PIPE_USES=		python:3.6+
-MOD_NYQ_BENCH_CONFIGURE_WITH=	mod-nyq-bench
-MOD_NYQ_BENCH_USES=		python:3.6+
+MIDI_CMAKE_ON=		-Daudacity_use_midi:STRING=local
+MIDI_CMAKE_OFF=		-Daudacity_use_midi:STRING=off

-SBSMS_CONFIGURE_WITH=	sbsms
+# TODO: fix NLS support properly
+PLIST_SUB+=		NLS=""

-SOUNDTOUCH_CONFIGURE_WITH=	soundtouch=system
+NYQUIST_CMAKE_ON=	-Daudacity_use_nyquist:STRING=local
+NYQUIST_CMAKE_OFF=	-Daudacity_use_nyquist:STRING=off
+
+OGG_CMAKE_ON=		-Daudacity_use_ogg:STRING=system
+OGG_CMAKE_OFF=		-Daudacity_use_ogg:STRING=local
+OGG_LIB_DEPENDS=	libogg.so:audio/libogg
+
+SBSMS_CMAKE_ON=		-Daudacity_use_sbsms:STRING=local
+SBSMS_CMAKE_OFF=	-Daudacity_use_sbsms:STRING=off
+
+SOUNDTOUCH_CMAKE_ON=	-Daudacity_use_soundtouch:STRING=system
+SOUNDTOUCH_CMAKE_OFF=	-Daudacity_use_soundtouch:STRING=off
 SOUNDTOUCH_LIB_DEPENDS=		libSoundTouch.so:audio/soundtouch

-SSE_CONFIGURE_ENABLE=	sse
-
-TWOLAME_CONFIGURE_WITH=	libtwolame=system
+TWOLAME_CMAKE_ON=	-Daudacity_use_twolame:STRING=system
+TWOLAME_CMAKE_OFF=	-Daudacity_use_twolame:STRING=off
 TWOLAME_LIB_DEPENDS=	libtwolame.so:audio/twolame

-VAMP_CONFIGURE_WITH=	libvamp=system
+VAMP_CMAKE_ON=		-Daudacity_use_vamp:STRING=system
+VAMP_CMAKE_OFF=		-Daudacity_use_vamp:STRING=off
 VAMP_LIB_DEPENDS=	libvamp-hostsdk.so:audio/vamp-plugin-sdk

-VORBIS_CONFIGURE_WITH=	libvorbis=system
+VORBIS_CMAKE_ON=	-Daudacity_use_vorbis:STRING=system
+VORBIS_CMAKE_OFF=	-Daudacity_use_vorbis:STRING=off
 VORBIS_LIB_DEPENDS=	libogg.so:audio/libogg \
 			libvorbis.so:audio/libvorbis

-VST_CONFIGURE_ENABLE=	vst
+VST_CMAKE_BOOL=		audacity_use_vst
+
+post-patch:
+	@${REINPLACE_CMD} -e 's,Python2,Python${PYTHON_MAJOR_VER}, ; \
+		/CMAKE_CXX_STANDARD/s,14,11,' ${WRKSRC}/CMakeLists.txt

 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
--- a/audio/audacity/distinfo
+++ b/audio/audacity/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1579914119
-SHA256 (audacity-audacity-Audacity-2.3.3_GH0.tar.gz) = 404e6c49693dedc94212fc5525974058d848536025e19da31359ae02babe8bd7
-SIZE (audacity-audacity-Audacity-2.3.3_GH0.tar.gz) = 62073352
+TIMESTAMP = 1589881433
+SHA256 (audacity-audacity-Audacity-2.4.1_GH0.tar.gz) = 50240f07471373a7e5c2df65cc26eeeaaced9a0850ad1f95cb795f171ea3009f
+SIZE (audacity-audacity-Audacity-2.4.1_GH0.tar.gz) = 63935461
--- a/audio/audacity/files/patch-cmake-proxies_CMakeLists.txt
+++ b/audio/audacity/files/patch-cmake-proxies_CMakeLists.txt
@ -0,0 +1,11 @@
+--- cmake-proxies/CMakeLists.txt.orig	2020-05-19 09:43:53 UTC
+++ cmake-proxies/CMakeLists.txt
+@@ -150,7 +150,7 @@ addlib( lame               lame        LAME        YES
+ addlib( lib-widget-extra   libextra    EXTRA       YES   YES   "" )
+ addlib( libsndfile         sndfile     SNDFILE     YES   YES   "sndfile >= 1.0.28" )
+ addlib( libsoxr            soxr        SOXR        YES   YES   "soxr >= 0.1.1" )
+-addlib( portaudio-v19      portaudio   PORTAUDIO   YES   YES   "" )
+addlib( portaudio-v19      portaudio   PORTAUDIO   YES   YES   "portaudio-2.0 >= 19" )
+ 
+ # Optional libraries
+ #
--- a/audio/audacity/files/patch-cmake-proxies_sbsms_CMakeLists.txt
+++ b/audio/audacity/files/patch-cmake-proxies_sbsms_CMakeLists.txt
@ -0,0 +1,10 @@
+--- cmake-proxies/sbsms/CMakeLists.txt.orig	2020-05-19 09:43:53 UTC
+++ cmake-proxies/sbsms/CMakeLists.txt
+@@ -28,6 +28,7 @@ list( APPEND INCLUDES
+ list( APPEND OPTIONS
+    PRIVATE
+       $<$<C_COMPILER_ID:AppleClang,Clang,GNU>:-Wno-enum-compare>
+      ${SSE_FLAG}
+ )
+ 
+ find_package( Threads )
--- a/audio/audacity/files/patch-configure.ac
+++ b/audio/audacity/files/patch-configure.ac
@ -1,39 +0,0 @@
--- configure.ac.orig	2019-02-24 08:28:05 UTC
-+++ configure.ac
-@@ -200,14 +200,6 @@ if test x$enable_universal_binary = xyes; then
-    esac
- fi
- 
-dnl Check if $CXX is clang by evaluating the version string because
-dnl $ax_cv_cxx_compiler_vendor seems not to work (it is either "gnu" or just empty).
-dnl If $CXX is clang (string is found), grep returns 0 and the if is executed.
-dnl Use /dev/null to suppress grep output to shell.
-if ($CXX --version | grep 'clang version' > /dev/null); then
-    LDFLAGS="${LDFLAGS} -latomic"
-fi
-
- if test x$enable_sse = xyes; then
- 
-    if test "${ax_cv_cxx_compiler_vendor}" = "gnu"; then
-@@ -239,20 +231,7 @@ dnl check if alloca.h exists. If it does, we need to i
- dnl Solaris builds, by defining HAVE_ALLOCA_H
- AC_CHECK_HEADERS_ONCE(alloca.h)
- 
-
-dnl Enable C++ 11 support. Use gnu++11 on GCC since wxWidgets uses extensions
-if "${CXX}" -v 2>&1 | grep -q '^gcc version'; then
-
-    dnl GCC < 4.9 has known bugs (#1397) and can't be used
-    AX_GCC_VERSION_ATLEAST(4,9,0,[gcc_ok=yes], [gcc_ok=no])
-    if test x$gcc_ok = xno; then
-        AC_MSG_ERROR([Audacity requires at least GCC 4.9])
-    fi
-
-    CXXFLAGS="${CXXFLAGS} --std=gnu++11"
-else
-    CXXFLAGS="${CXXFLAGS} --std=c++11"
-fi
-+CXXFLAGS="${CXXFLAGS} --std=c++11"
- 
- dnl --------------------------------------------------------------------------
- dnl We would like warnings enabled on the builds, but different compilers need
--- a/audio/audacity/files/patch-lib-src_FileDialog_Makefile.am
+++ b/audio/audacity/files/patch-lib-src_FileDialog_Makefile.am
@ -1,52 +0,0 @@
--- lib-src/FileDialog/Makefile.am.orig	2018-10-01 14:07:33 UTC
-+++ lib-src/FileDialog/Makefile.am
-@@ -2,5 +2,7 @@
- ACLOCAL_AMFLAGS = -I m4
- 
-+SUBDIRS=	$(GTK_SUBDIR) $(MAC_SUBDIR) $(WINDOWS_SUBDIR)
-+DIST_SUBDIRS=	gtk mac win
- lib_LTLIBRARIES = libFileDialog.la
- 
- libFileDialog_la_LIBTOOLFLAGS = --tag=CXX
-@@ -11,22 +13,32 @@ libFileDialog_la_LIBADD = $(WX_LIBS)
- libFileDialog_la_SOURCES = FileDialog.cpp FileDialog.h
- 
- if GTK
-libFileDialog_la_CPPFLAGS += $(GTK_CFLAGS)
-libFileDialog_la_LIBADD += $(GTK_LIBS)
-+GTK_SUBDIR=	gtk
-+libFileDialog_la_LIBADD += \
-+	gtk/libFileDialog.la \
-+	$(NULL)
- libFileDialog_la_SOURCES += \
-	gtk/FileDialogPrivate.cpp \
- 	gtk/FileDialogPrivate.h \
- 	$(NULL)
- endif
- 
- if MAC
-libFileDialog_la_SOURCES += mac/FileDialogPrivate.mm \
-									 mac/FileDialogPrivate.h \
-									 $(NULL)
-+MAC_SUBDIR=	mac
-+libFileDialog_la_LIBADD+= \
-+	mac/libFileDialog.la \
-+	$(NULL)
-+libFileDialog_la_SOURCES += \
-+	mac/FileDialogPrivate.h \
-+	$(NULL)
-+#nodist_EXTRA_libFileDialog_la_SOURCES = dummy.mm
- endif
- 
- if WINDOWS
-libFileDialog_la_SOURCES += win/FileDialogPrivate.cpp \
-									 win/FileDialogPrivate.h \
-									 $(NULL)
-+WINDOWS_SUBDIR=	win
-+libFileDialog_la_LIBADD+= \
-+	win/libFileDialog.la \
-+	$(NULL)
-+libFileDialog_la_SOURCES += \
-+	win/FileDialogPrivate.h \
-+	$(NULL)
- endif
--- a/audio/audacity/files/patch-lib-src_FileDialog_configure.ac
+++ b/audio/audacity/files/patch-lib-src_FileDialog_configure.ac
@ -1,11 +0,0 @@
--- lib-src/FileDialog/configure.ac.orig	2018-09-20 14:35:07 UTC
-+++ lib-src/FileDialog/configure.ac
-@@ -132,7 +132,7 @@ AM_CONDITIONAL([WINDOWS], test "$IMPLEMENTATION" = "wi
- 
- echo "Implementation to use: $IMPLEMENTATION"
- 
-AC_CONFIG_FILES([Makefile])
-+AC_CONFIG_FILES([Makefile gtk/Makefile mac/Makefile win/Makefile])
- 
- #
- # Write it all out
--- a/audio/audacity/files/patch-lib-src_FileDialog_gtk_Makefile.am
+++ b/audio/audacity/files/patch-lib-src_FileDialog_gtk_Makefile.am
@ -1,15 +0,0 @@
--- lib-src/FileDialog/gtk/Makefile.am.orig	2016-07-26 13:34:07 UTC
-+++ lib-src/FileDialog/gtk/Makefile.am
-@@ -0,0 +1,12 @@
-+ACLOCAL_AMFLAGS=	-I m4
-+noinst_LTLIBRARIES=	libFileDialog.la
-+libFileDialog_la_CPPFLAGS= \
-+	$(WX_CXXFLAGS) -Wno-deprecated-declarations \
-+	$(GTK_CFLAGS)
-+libFileDialog_la_LIBADD= \
-+	$(WX_LIBS) \
-+	$(GTK_LIBS)
-+libFileDialog_la_SOURCES= \
-+	FileDialogPrivate.cpp \
-+	FileDialogPrivate.h \
-+	$(NULL)
--- a/audio/audacity/files/patch-lib-src_FileDialog_mac_Makefile.am
+++ b/audio/audacity/files/patch-lib-src_FileDialog_mac_Makefile.am
@ -1,13 +0,0 @@
--- lib-src/FileDialog/mac/Makefile.am.orig	2016-07-26 13:34:07 UTC
-+++ lib-src/FileDialog/mac/Makefile.am
-@@ -0,0 +1,10 @@
-+ACLOCAL_AMFLAGS=	-I m4
-+noinst_LTLIBRARIES=	libFileDialog.la
-+libFileDialog_la_CPPFLAGS= \
-+	$(WX_CXXFLAGS) -Wno-deprecated-declarations
-+libFileDialog_la_LIBADD= \
-+	$(WX_LIBS)
-+libFileDialog_la_SOURCES= \
-+	FileDialogPrivate.mm \
-+	FileDialogPrivate.h \
-+	$(NULL)
--- a/audio/audacity/files/patch-lib-src_FileDialog_win_Makefile.am
+++ b/audio/audacity/files/patch-lib-src_FileDialog_win_Makefile.am
@ -1,13 +0,0 @@
--- lib-src/FileDialog/win/Makefile.am.orig	2016-07-26 13:34:07 UTC
-+++ lib-src/FileDialog/win/Makefile.am
-@@ -0,0 +1,10 @@
-+ACLOCAL_AMFLAGS=	-I m4
-+noinst_LTLIBRARIES=	libFileDialog.la
-+libFileDialog_la_CPPFLAGS= \
-+	$(WX_CXXFLAGS) -Wno-deprecated-declarations
-+libFileDialog_la_LIBADD= \
-+	$(WX_LIBS)
-+libFileDialog_la_SOURCES= \
-+	FileDialogPrivate.cpp \
-+	FileDialogPrivate.h \
-+	$(NULL)
--- a/audio/audacity/files/patch-lib-src_lv2_configure
+++ b/audio/audacity/files/patch-lib-src_lv2_configure
@ -1,11 +0,0 @@
--- lib-src/lv2/configure.orig	2016-01-08 22:05:48 UTC
-+++ lib-src/lv2/configure
-@@ -54,7 +54,7 @@ includedir=.
- Name: ${pkg}
- Version: ${version}
- Description: Temporary fake config file
-Libs: -L\${libdir} ${lib} -ldl -lm
-+Libs: -L\${libdir} ${lib} -lm
- Cflags: -I\${includedir}/${pkg}${major}
- EOF
- 
--- a/audio/audacity/files/patch-src_Makefile.am
+++ b/audio/audacity/files/patch-src_Makefile.am
@ -1,12 +0,0 @@
--- src/Makefile.am.orig	2016-07-26 13:34:06 UTC
-+++ src/Makefile.am
-@@ -79,8 +79,7 @@ audacity_CPPFLAGS = \
- #  /usr/local/include/wx-2.8/wx/buffer.h:289:9: note: in expansion of macro 'wxCHECK_RET'
- #           wxCHECK_RET( m_bufdata->m_data, wxT("invalid wxMemoryBuffer") );
- #           ^
-audacity_CXXFLAGS = \
-   -Wno-unused-local-typedefs
-+audacity_CXXFLAGS =
- 
- audacity_LDFLAGS = -rdynamic
- audacity_LDADD = \
--- a/audio/audacity/pkg-plist
+++ b/audio/audacity/pkg-plist
@ -3,23 +3,15 @@ man/man1/audacity.1.gz
 share/appdata/audacity.appdata.xml
 share/applications/audacity.desktop
 %%DATADIR%%/EQDefaultCurves.xml
-%%DATADIR%%/include/audacity/ComponentInterface.h
-%%DATADIR%%/include/audacity/ConfigInterface.h
-%%DATADIR%%/include/audacity/EffectAutomationParameters.h
-%%DATADIR%%/include/audacity/EffectInterface.h
-%%DATADIR%%/include/audacity/ImporterInterface.h
-%%DATADIR%%/include/audacity/ModuleInterface.h
-%%DATADIR%%/include/audacity/PluginInterface.h
-%%DATADIR%%/include/audacity/Types.h
 %%DATADIR%%/nyquist/aud-do-support.lsp
 %%DATADIR%%/nyquist/dspprims.lsp
 %%DATADIR%%/nyquist/envelopes.lsp
 %%DATADIR%%/nyquist/equalizer.lsp
 %%DATADIR%%/nyquist/evalenv.lsp
 %%DATADIR%%/nyquist/fileio.lsp
-%%DATADIR%%/nyquist/follow.lsp
 %%DATADIR%%/nyquist/init.lsp
 %%DATADIR%%/nyquist/misc.lsp
+%%DATADIR%%/nyquist/nyinit-dbg.lsp
 %%DATADIR%%/nyquist/nyinit.lsp
 %%DATADIR%%/nyquist/nyqmisc.lsp
 %%DATADIR%%/nyquist/nyquist-plot.txt
@ -46,11 +38,13 @@ share/applications/audacity.desktop
 %%DATADIR%%/nyquist/seq.lsp
 %%DATADIR%%/nyquist/seqfnint.lsp
 %%DATADIR%%/nyquist/seqmidi.lsp
+%%DATADIR%%/nyquist/sliders.lsp
 %%DATADIR%%/nyquist/sndfnint.lsp
+%%DATADIR%%/nyquist/spec-plot.lsp
+%%DATADIR%%/nyquist/spectral-analysis.lsp
 %%DATADIR%%/nyquist/stk.lsp
 %%DATADIR%%/nyquist/system.lsp
 %%DATADIR%%/nyquist/test.lsp
-%%DATADIR%%/nyquist/upic.sal
 %%DATADIR%%/nyquist/velocity.lsp
 %%DATADIR%%/nyquist/xlinit.lsp
 %%DATADIR%%/nyquist/xm.lsp
@ -66,10 +60,12 @@ share/applications/audacity.desktop
 %%DATADIR%%/plug-ins/crossfadeclips.ny
 %%DATADIR%%/plug-ins/crossfadetracks.ny
 %%DATADIR%%/plug-ins/delay.ny
+%%DATADIR%%/plug-ins/eq-xml-to-txt-converter.ny
 %%DATADIR%%/plug-ins/equalabel.ny
 %%DATADIR%%/plug-ins/highpass.ny
 %%DATADIR%%/plug-ins/limiter.ny
 %%DATADIR%%/plug-ins/lowpass.ny
+%%DATADIR%%/plug-ins/noisegate.ny
 %%DATADIR%%/plug-ins/notch.ny
 %%DATADIR%%/plug-ins/nyquist-plug-in-installer.ny
 %%DATADIR%%/plug-ins/pluck.ny
@ -78,14 +74,15 @@ share/applications/audacity.desktop
 %%DATADIR%%/plug-ins/rms.ny
 %%DATADIR%%/plug-ins/sample-data-export.ny
 %%DATADIR%%/plug-ins/sample-data-import.ny
+%%DATADIR%%/plug-ins/spectral-delete.ny
 %%DATADIR%%/plug-ins/tremolo.ny
 %%DATADIR%%/plug-ins/vocalrediso.ny
 %%DATADIR%%/plug-ins/vocoder.ny
-share/icons/hicolor/16x16/apps/audacity.png
-share/icons/hicolor/22x22/apps/audacity.png
-share/icons/hicolor/24x24/apps/audacity.png
-share/icons/hicolor/32x32/apps/audacity.png
-share/icons/hicolor/48x48/apps/audacity.png
+share/icons/hicolor/16x16/audacity.png
+share/icons/hicolor/22x22/audacity.png
+share/icons/hicolor/24x24/audacity.png
+share/icons/hicolor/32x32/audacity.png
+share/icons/hicolor/48x48/audacity.png
 share/icons/hicolor/scalable/apps/audacity.svg
 %%NLS%%share/locale/af/LC_MESSAGES/audacity.mo
 %%NLS%%share/locale/ar/LC_MESSAGES/audacity.mo
--- a/audio/carla/Makefile
+++ b/audio/carla/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	Carla
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.1
+DISTVERSION=	2.1.1
 CATEGORIES=	audio

 MAINTAINER=	yuri@FreeBSD.org
--- a/audio/carla/distinfo
+++ b/audio/carla/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1586761076
-SHA256 (falkTX-Carla-v2.1_GH0.tar.gz) = a82ce08f3a82db9d878c8cb7e7e2f3b80834bf21801c6ec4ed95c0cfee25b963
-SIZE (falkTX-Carla-v2.1_GH0.tar.gz) = 9174832
+TIMESTAMP = 1591970579
+SHA256 (falkTX-Carla-v2.1.1_GH0.tar.gz) = 8611d6fc579ea55ab205cfb72571eb304da9ef997e7bbae5af5a339ef533d5d9
+SIZE (falkTX-Carla-v2.1.1_GH0.tar.gz) = 9177989
--- a/audio/carla/files/patch-source_theme_CarlaStyle.cpp
+++ b/audio/carla/files/patch-source_theme_CarlaStyle.cpp
@ -1,10 +0,0 @@
--- source/theme/CarlaStyle.cpp.orig	2020-05-28 16:39:10 UTC
-+++ source/theme/CarlaStyle.cpp
-@@ -22,6 +22,7 @@
- 
- #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
- # include <QtGui/QPainter>
-+# include <QtGui/QPainterPath>
- # include <QtGui/QPixmapCache>
- # include <QtWidgets/qdrawutil.h>
- # include <QtWidgets/QApplication>
--- a/audio/csound/Makefile
+++ b/audio/csound/Makefile
@ -12,7 +12,7 @@ LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING

 BUILD_DEPENDS=	boost-libs>0:devel/boost-libs \
-		swig3.0:devel/swig30 \
+		swig:devel/swig \
 		gmm++>0:math/gmm++
 LIB_DEPENDS=	libsamplerate.so:audio/libsamplerate \
 		libsndfile.so:audio/libsndfile
@ -32,7 +32,6 @@ CMAKE_ARGS=	-DBUILD_CSOUNDVST:BOOL=OFF \
 		-DOPSYS:STRING="${OPSYS}"
 CMAKE_OFF=	USE_ALSA BUILD_JAVA_INTERFACE BUILD_TESTS
 SSP_UNSAFE=	yes
-BINARY_ALIAS=	swig=swig3.0
 LDFLAGS+=	-lexecinfo

 SUB_FILES=	pkg-message
--- a/audio/giada/Makefile
+++ b/audio/giada/Makefile
@ -2,7 +2,8 @@

 PORTNAME=	giada
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.16.2.2
+DISTVERSION=	0.16.3-2
+DISTVERSIONSUFFIX=	-g149d7b4b
 CATEGORIES=	audio

 MAINTAINER=	yuri@FreeBSD.org
--- a/audio/giada/distinfo
+++ b/audio/giada/distinfo
@ -1,6 +1,6 @@
-TIMESTAMP = 1590606240
-SHA256 (monocasual-giada-v0.16.2.2_GH0.tar.gz) = 0e6eac3ee5ef81177b3c7d1befe21c2ed1cb5efb448ae1d7d20701365ea27b4c
-SIZE (monocasual-giada-v0.16.2.2_GH0.tar.gz) = 462616
+TIMESTAMP = 1592417710
+SHA256 (monocasual-giada-v0.16.3-2-g149d7b4b_GH0.tar.gz) = c08c118503e01009e7a2c47f00ae6ee89baf86b63366378d6038e352075cb177
+SIZE (monocasual-giada-v0.16.3-2-g149d7b4b_GH0.tar.gz) = 472496
 SHA256 (nlohmann-json-bde5712_GH0.tar.gz) = 4032f98d302bebeea03769599c5f07ac750547718f0d50145f3f4abfc047bfd1
 SIZE (nlohmann-json-bde5712_GH0.tar.gz) = 119014037
 SHA256 (monocasual-rtaudio-5386a90_GH0.tar.gz) = 6b0241315ea640f93764b0198d3a0f63d43c21ed977c6503ae215b6f04bff9c2
--- a/audio/lash/Makefile
+++ b/audio/lash/Makefile
@ -36,8 +36,7 @@ OPTIONS_SUB=	yes

 PYTHON_DESC=	Build pylash
 PYTHON_USES=	python
-PYTHON_BUILD_DEPENDS=	swig3.0:devel/swig30
-PYTHON_BINARY_ALIAS=	swig=swig3.0
+PYTHON_BUILD_DEPENDS=	swig:devel/swig
 PYTHON_CONFIGURE_ENABLE=pylash
 PYTHON_BROKEN=	Does not package

--- a/audio/lenticular-lv2/Makefile
+++ b/audio/lenticular-lv2/Makefile
@ -0,0 +1,44 @@
+# $FreeBSD$
+
+PORTNAME=	lenticular
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.5.0-14
+DISTVERSIONSUFFIX=	-g14d8075
+CATEGORIES=	audio
+PKGNAMESUFFIX=	-lv2
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	LV2 plugins based on Mutable Instrument's Clouds
+
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+
+BUILD_DEPENDS=	lv2>0:audio/lv2
+
+USES=		gmake pkgconfig
+USE_GITHUB=	yes
+GH_ACCOUNT=	polyeffects
+GH_PROJECT=	lenticular_lv2
+
+GH_TUPLE=	\
+		VCVRack:pichenettes-eurorack:99432f2bf443219b3eb77e65e1a18583faad422e:AndrewBelt_eurorack/eurorack \
+		pichenettes:avril:36b988a851f8638adb9f53ff98939cb08ffce8cc:pichenettes_avril/parasites/avrlib \
+		pichenettes:avrilx:5c28367e91dfb036593e876c886241cf81f60a2d:pichenettes_avrilx/parasites/avrlibx \
+		pichenettes:stm-audio-bootloader:6f20ead22a28967b0446546d2fcf0dfb9599ba93:pichenettes_stm_audio_bootloader/parasites/stm_audio_bootloader \
+		pichenettes:avr-audio-bootloader:52754f878b4883adf565bc3ddf691c5e1c4a9f6d:pichenettes_avr_audio_bootloader/parasites/avr_audio_bootloader \
+		mqtthiqs:stmlib:8ab2aaee77cbacb47b646d46d22ee5d358effe2d:mqtthiqs_stmlib/parasites/stmlib \
+		pichenettes:stmlib:d9b189670be3d5c1e41ee143b6ee92171cfd6de3:pichenettes_stmlib/eurorack/stmlib
+
+PLIST_FILES=	\
+	lib/lv2/polylenticular.lv2/manifest.ttl \
+	lib/lv2/polylenticular.lv2/polyclouds.so \
+	lib/lv2/polylenticular.lv2/polyclouds.ttl \
+	lib/lv2/polylenticular.lv2/polyplaits.so \
+	lib/lv2/polylenticular.lv2/polyplaits.ttl \
+	lib/lv2/polylenticular.lv2/polywarps.so \
+	lib/lv2/polylenticular.lv2/polywarps.ttl
+
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lv2/polylenticular.lv2/*.so
+
+.include <bsd.port.mk>
--- a/audio/lenticular-lv2/distinfo
+++ b/audio/lenticular-lv2/distinfo
@ -0,0 +1,17 @@
+TIMESTAMP = 1592281045
+SHA256 (polyeffects-lenticular_lv2-v0.5.0-14-g14d8075_GH0.tar.gz) = 108401c9df0f8665e7efc276eccb3e0fdb897a6eee867eb8cef4def83bbb5e30
+SIZE (polyeffects-lenticular_lv2-v0.5.0-14-g14d8075_GH0.tar.gz) = 24648132
+SHA256 (VCVRack-pichenettes-eurorack-99432f2bf443219b3eb77e65e1a18583faad422e_GH0.tar.gz) = 3e3c56189551e276d94ff31253400e9fa61910cbd5fff09d2f8f142a2ba5b593
+SIZE (VCVRack-pichenettes-eurorack-99432f2bf443219b3eb77e65e1a18583faad422e_GH0.tar.gz) = 29678500
+SHA256 (pichenettes-avril-36b988a851f8638adb9f53ff98939cb08ffce8cc_GH0.tar.gz) = 553a088272528f855165f4ab08e2370e71c7f574ea84a3105a27df34268ecf5a
+SIZE (pichenettes-avril-36b988a851f8638adb9f53ff98939cb08ffce8cc_GH0.tar.gz) = 97522
+SHA256 (pichenettes-avrilx-5c28367e91dfb036593e876c886241cf81f60a2d_GH0.tar.gz) = 1c89d9f7211912a9c5c1773722d31164e1ed35a1dafeebd5b9604cebcb0cbc96
+SIZE (pichenettes-avrilx-5c28367e91dfb036593e876c886241cf81f60a2d_GH0.tar.gz) = 99557
+SHA256 (pichenettes-stm-audio-bootloader-6f20ead22a28967b0446546d2fcf0dfb9599ba93_GH0.tar.gz) = 629289189eff564932a0933ee47573fd254936f2faada71ca0fb4d3b089b2226
+SIZE (pichenettes-stm-audio-bootloader-6f20ead22a28967b0446546d2fcf0dfb9599ba93_GH0.tar.gz) = 11861
+SHA256 (pichenettes-avr-audio-bootloader-52754f878b4883adf565bc3ddf691c5e1c4a9f6d_GH0.tar.gz) = 80e9e34572e0b73d7e5e8ebb45b45fc024f9b35f4d47fdcc76a2451ca8869408
+SIZE (pichenettes-avr-audio-bootloader-52754f878b4883adf565bc3ddf691c5e1c4a9f6d_GH0.tar.gz) = 8103
+SHA256 (mqtthiqs-stmlib-8ab2aaee77cbacb47b646d46d22ee5d358effe2d_GH0.tar.gz) = 335b2c0059eee86b7e4c4ae48bce9048eda096a4180ef302bdbfb37f44b7183f
+SIZE (mqtthiqs-stmlib-8ab2aaee77cbacb47b646d46d22ee5d358effe2d_GH0.tar.gz) = 2977099
+SHA256 (pichenettes-stmlib-d9b189670be3d5c1e41ee143b6ee92171cfd6de3_GH0.tar.gz) = cff8e7d80f5fa4bc429f1a444db1058efb38dd5d15da7a1b8985a2c67139bb62
+SIZE (pichenettes-stmlib-d9b189670be3d5c1e41ee143b6ee92171cfd6de3_GH0.tar.gz) = 5998961
--- a/audio/lenticular-lv2/pkg-descr
+++ b/audio/lenticular-lv2/pkg-descr
@ -0,0 +1,10 @@
+LV2 plugins based on Mutable Instrument's Clouds.
+
+Features:
+* Implements the alternative modes and quality options of Clouds as
+  a menu options
+* Inputs and knobs for the 3 addition 'Blend' parameters (Stereo Spread,
+  Feedback, and Reverb)
+* Dedicated Freeze button
+
+WWW: https://github.com/polyeffects/lenticular_lv2
--- a/audio/libadplug/Makefile
+++ b/audio/libadplug/Makefile
@ -14,7 +14,8 @@ LICENSE=	GPLv2

 LIB_DEPENDS=	libbinio.so:devel/libbinio

-USES=		autoreconf libtool makeinfo pathfix pkgconfig
+USES=		autoreconf compiler:c++11-lang libtool makeinfo pathfix \
+		pkgconfig
 USE_CSTD=	gnu89
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
--- a/audio/linux-c7-gsm/Makefile
+++ b/audio/linux-c7-gsm/Makefile
@ -0,0 +1,19 @@
+# $FreeBSD$
+
+PORTNAME=	gsm
+PORTVERSION=	1.0.13
+DISTVERSIONSUFFIX=	-11.el7
+CATEGORIES=	audio linux
+
+MAINTAINER=	emulation@FreeBSD.org
+COMMENT=	GSM audio codec (CentOS ${LINUX_DIST_VER})
+
+USES=		linux:c7
+USE_LDCONFIG=	yes
+USE_LINUX_RPM=	yes
+
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.mk>
--- a/audio/linux-c7-gsm/distinfo
+++ b/audio/linux-c7-gsm/distinfo
@ -0,0 +1,7 @@
+TIMESTAMP = 1592388883
+SHA256 (centos/gsm-1.0.13-11.el7.i686.rpm) = a1649b9d67a999d5a06d433f51919f541a0176a1879c41ba9250832be55773c3
+SIZE (centos/gsm-1.0.13-11.el7.i686.rpm) = 30316
+SHA256 (centos/gsm-1.0.13-11.el7.x86_64.rpm) = 0febb3319e3aef1e1192a5622c5fe0f5963ec6102dc9f60b158d8b4afa601bc3
+SIZE (centos/gsm-1.0.13-11.el7.x86_64.rpm) = 30212
+SHA256 (centos/gsm-1.0.13-11.el7.src.rpm) = 948b58654cac292bb2508fb656906e6346cc8e4de8891325550be24154fecfea
+SIZE (centos/gsm-1.0.13-11.el7.src.rpm) = 78519
--- a/audio/linux-c7-gsm/pkg-plist.amd64
+++ b/audio/linux-c7-gsm/pkg-plist.amd64
@ -0,0 +1,8 @@
+usr/lib/libgsm.so.1
+usr/lib/libgsm.so.1.0.12
+usr/lib64/libgsm.so.1
+usr/lib64/libgsm.so.1.0.12
+%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/MACHINES
+%%PORTDOCS%%%%DOCSDIR%%/README
--- a/audio/linux-c7-gsm/pkg-plist.i386
+++ b/audio/linux-c7-gsm/pkg-plist.i386
@ -0,0 +1,6 @@
+usr/lib/libgsm.so.1
+usr/lib/libgsm.so.1.0.12
+%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/MACHINES
+%%PORTDOCS%%%%DOCSDIR%%/README
--- a/audio/linux-c7-libsndfile/Makefile
+++ b/audio/linux-c7-libsndfile/Makefile
@ -4,7 +4,7 @@
 PORTNAME=	libsndfile
 PORTVERSION=	1.0.25
 DISTVERSIONSUFFIX=	-11.el7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio linux

 MAINTAINER=	emulation@FreeBSD.org
@ -12,7 +12,7 @@ COMMENT=	Reading and writing files containing sampled sound (like WAV or AIFF) (

 USES=		linux:c7
 USE_LDCONFIG=	yes
-USE_LINUX=	flac libogg libvorbis
+USE_LINUX=	flac gsm libogg libvorbis
 USE_LINUX_RPM=	yes

 CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
--- a/audio/mumble/Makefile
+++ b/audio/mumble/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	mumble
-PORTVERSION=	1.3.0
-PORTREVISION=	4
+PORTVERSION=	1.3.1
 CATEGORIES=	audio

 MAINTAINER=	feld@FreeBSD.org
@ -35,10 +34,10 @@ GH_TUPLE=	mumble-voip:mumble:${DISTVERSION} \
 		mumble-voip:celt-0.7.0:5a16cda:mumble_celt_0_7/3rdparty/celt-0.7.0-src \
 		mumble-voip:celt-0.11.0:e18de77:mumble_celt_0_11/3rdparty/celt-0.11.0-src \
 		mumble-voip:mach_override:919148f:mumble_mach_override/3rdparty/mach-override-src \
-		mumble-voip:minhook:9fbd087:mumble_minhook/3rdparty/minhook-src \
+		mumble-voip:minhook:5e338f8:mumble_minhook/3rdparty/minhook-src \
 		mumble-voip:rnnoise:b30f2bb:mumble_rnnoise/3rdparty/rnnoise-src \
 		mumble-voip:sbcelt:045493d:mumble_sbcelt/3rdparty/sbcelt-src \
-		mumble-voip:mumble-theme:7dfb1e9:mumble_theme/themes/Mumble
+		mumble-voip:mumble-theme:9467fe8:mumble_theme/themes/Mumble

 USE_QT=		buildtools_build core gui l10n linguist_build network opengl sql sql-sqlite3_run svg widgets xml
 USE_LDCONFIG=	yes
--- a/audio/mumble/distinfo
+++ b/audio/mumble/distinfo
@ -1,17 +1,17 @@
-TIMESTAMP = 1568241137
-SHA256 (mumble-voip-mumble-1.3.0_GH0.tar.gz) = 388d8f023a73dafdacdb7556bf503c40b57e2e41679cc7490e884dd7013ab600
-SIZE (mumble-voip-mumble-1.3.0_GH0.tar.gz) = 4888455
+TIMESTAMP = 1592417992
+SHA256 (mumble-voip-mumble-1.3.1_GH0.tar.gz) = ea37f16b1336024db26efb14060f6eddb703f5c1d83d63b6c0a088e94079cd46
+SIZE (mumble-voip-mumble-1.3.1_GH0.tar.gz) = 4894243
 SHA256 (mumble-voip-celt-0.7.0-5a16cda_GH0.tar.gz) = fbfdbb0767d9d67ea29270eb3e5e999eec6f7f3720a870e74776be426b10b53a
 SIZE (mumble-voip-celt-0.7.0-5a16cda_GH0.tar.gz) = 182631
 SHA256 (mumble-voip-celt-0.11.0-e18de77_GH0.tar.gz) = b522482222c40c1f05ce9b6c4d19a05e8419a7850398dbbdea5854b78eadfd4a
 SIZE (mumble-voip-celt-0.11.0-e18de77_GH0.tar.gz) = 212833
 SHA256 (mumble-voip-mach_override-919148f_GH0.tar.gz) = 81b2e705a7cce1e3a9eb440cb2bca2f14fd83db162123f44faf17f0bf45da1bd
 SIZE (mumble-voip-mach_override-919148f_GH0.tar.gz) = 66278
-SHA256 (mumble-voip-minhook-9fbd087_GH0.tar.gz) = 80a266b39a64106562400d328829f01787f60f91fca18c2255e20f2db0883d29
-SIZE (mumble-voip-minhook-9fbd087_GH0.tar.gz) = 26391
+SHA256 (mumble-voip-minhook-5e338f8_GH0.tar.gz) = bc675c5b9def1fcef4b58c62e6d69eaa6e76d2fed89ace681059a7648e808033
+SIZE (mumble-voip-minhook-5e338f8_GH0.tar.gz) = 27651
 SHA256 (mumble-voip-rnnoise-b30f2bb_GH0.tar.gz) = 68ce21e49a0af3d06d87d27665d9a2102c249e4e5e91f777e47139d8707aeb6d
 SIZE (mumble-voip-rnnoise-b30f2bb_GH0.tar.gz) = 171240
 SHA256 (mumble-voip-sbcelt-045493d_GH0.tar.gz) = dc9bdcc26a3642cb7ead98cb487c9a52225228fbbfa6f75906d9e479e11b862a
 SIZE (mumble-voip-sbcelt-045493d_GH0.tar.gz) = 20128
-SHA256 (mumble-voip-mumble-theme-7dfb1e9_GH0.tar.gz) = 97b79768523888ca67cd42cf04bffe9c7063702fa5f445c1ab851809934b8bf5
-SIZE (mumble-voip-mumble-theme-7dfb1e9_GH0.tar.gz) = 375075
+SHA256 (mumble-voip-mumble-theme-9467fe8_GH0.tar.gz) = 4ac062686b75f8ea558a4d92df205e51c1d4c1b5676a28b656b8664fc56470db
+SIZE (mumble-voip-mumble-theme-9467fe8_GH0.tar.gz) = 378261
--- a/audio/murmur/Makefile
+++ b/audio/murmur/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	murmur
-PORTVERSION=	1.3.0
-PORTREVISION=	4
+PORTVERSION=	1.3.1
 CATEGORIES=	audio net

 MAINTAINER=	feld@FreeBSD.org
--- a/audio/murmur/distinfo
+++ b/audio/murmur/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1567947618
-SHA256 (mumble-voip-mumble-1.3.0_GH0.tar.gz) = 388d8f023a73dafdacdb7556bf503c40b57e2e41679cc7490e884dd7013ab600
-SIZE (mumble-voip-mumble-1.3.0_GH0.tar.gz) = 4888455
+TIMESTAMP = 1592494626
+SHA256 (mumble-voip-mumble-1.3.1_GH0.tar.gz) = ea37f16b1336024db26efb14060f6eddb703f5c1d83d63b6c0a088e94079cd46
+SIZE (mumble-voip-mumble-1.3.1_GH0.tar.gz) = 4894243
--- a/audio/noson-app/Makefile
+++ b/audio/noson-app/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	noson-app
-DISTVERSION=	4.3.3
+DISTVERSION=	4.3.4
 CATEGORIES=	audio net

 MAINTAINER=	tcberner@FreeBSD.org
--- a/audio/noson-app/distinfo
+++ b/audio/noson-app/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1589643723
-SHA256 (janbar-noson-app-4.3.3_GH0.tar.gz) = b89b67f9b4f330f24e2cf4d0de772fa8484959024359a689118622c27c1e1a7d
-SIZE (janbar-noson-app-4.3.3_GH0.tar.gz) = 2071000
+TIMESTAMP = 1592327941
+SHA256 (janbar-noson-app-4.3.4_GH0.tar.gz) = e4d5e4212b6461dc84fe34450dbd74d508fab0535688091fd14b0e38c3f71ac0
+SIZE (janbar-noson-app-4.3.4_GH0.tar.gz) = 2138467
--- a/audio/noson-app/pkg-plist
+++ b/audio/noson-app/pkg-plist
@ -8,5 +8,20 @@ lib/noson/NosonThumbnailer/qmldir
 lib/noson/noson-cli
 lib/noson/noson-gui
 share/applications/io.github.janbar.noson.desktop
+share/icons/hicolor/128x128/apps/noson.png
+share/icons/hicolor/16x16/apps/noson.png
+share/icons/hicolor/192x192/apps/noson.png
+share/icons/hicolor/22x22/apps/noson.png
+share/icons/hicolor/24x24/apps/noson.png
 share/icons/hicolor/256x256/apps/noson.png
+share/icons/hicolor/32x32/apps/noson.png
+share/icons/hicolor/36x36/apps/noson.png
+share/icons/hicolor/42x42/apps/noson.png
+share/icons/hicolor/48x48/apps/noson.png
+share/icons/hicolor/512x512/apps/noson.png
+share/icons/hicolor/64x64/apps/noson.png
+share/icons/hicolor/72x72/apps/noson.png
+share/icons/hicolor/80x80/apps/noson.png
+share/icons/hicolor/8x8/apps/noson.png
+share/icons/hicolor/96x96/apps/noson.png
 share/metainfo/io.github.janbar.noson.appdata.xml
--- a/audio/ocp/Makefile
+++ b/audio/ocp/Makefile
@ -14,7 +14,7 @@ COMMENT=	Legendary Open Cubic Player
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING

-ONLY_FOR_ARCHS=	amd64 i386 powerpc64
+ONLY_FOR_ARCHS=	amd64 i386 powerpc64 powerpc

 BUILD_DEPENDS=	xa65:devel/xa65
 LIB_DEPENDS=	libid3tag.so:audio/libid3tag \
@ -23,8 +23,8 @@ LIB_DEPENDS=	libid3tag.so:audio/libid3tag \
 		libsidplay.so:audio/libsidplay \
 		libvorbis.so:audio/libvorbis

-USES=		gmake gnome iconv localbase:ldflags makeinfo ncurses pkgconfig \
-		tar:xz
+USES=		compiler:c11 dos2unix gmake gnome iconv localbase:ldflags \
+		makeinfo ncurses pkgconfig tar:xz

 USE_GITHUB=	yes
 GH_ACCOUNT=	mywave82
--- a/audio/ocp/files/patch-playym_lzh_lzh.h
+++ b/audio/ocp/files/patch-playym_lzh_lzh.h
@ -0,0 +1,10 @@
+--- playym/lzh/lzh.h.orig	2020-06-17 18:26:50 UTC
+++ playym/lzh/lzh.h
+@@ -41,6 +41,7 @@
+ #ifndef LZH_H
+ #define LZH_H
+ 
+#include <sys/types.h>
+ 
+ #define BUFSIZE (1024 * 4)
+ 
--- a/audio/pavucontrol-qt/Makefile
+++ b/audio/pavucontrol-qt/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	pavucontrol-qt
-PORTVERSION=	0.14.1
+PORTVERSION=	0.15.0
 CATEGORIES=	audio
 MASTER_SITES=	LXQT/${PORTNAME}

--- a/audio/pavucontrol-qt/distinfo
+++ b/audio/pavucontrol-qt/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1563913793
-SHA256 (lxqt/pavucontrol-qt-0.14.1.tar.xz) = d805c9fd738b67a378edb432dc702ab4d009d2c9192fd977492ebbfc502ebca2
-SIZE (lxqt/pavucontrol-qt-0.14.1.tar.xz) = 94948
+TIMESTAMP = 1588439693
+SHA256 (lxqt/pavucontrol-qt-0.15.0.tar.xz) = c6148fabec2140a9b6e70620e1956c42617054373872525dc98018b22ab79397
+SIZE (lxqt/pavucontrol-qt-0.15.0.tar.xz) = 97480
--- a/audio/pavucontrol-qt/pkg-plist
+++ b/audio/pavucontrol-qt/pkg-plist
@ -1,6 +1,8 @@
 bin/pavucontrol-qt
 share/applications/pavucontrol-qt.desktop
+%%DATADIR%%/translations/pavucontrol-qt_arn.qm
 %%DATADIR%%/translations/pavucontrol-qt_as.qm
+%%DATADIR%%/translations/pavucontrol-qt_ast.qm
 %%DATADIR%%/translations/pavucontrol-qt_bn_IN.qm
 %%DATADIR%%/translations/pavucontrol-qt_ca.qm
 %%DATADIR%%/translations/pavucontrol-qt_cs.qm
--- a/audio/plasma5-plasma-pa/distinfo
+++ b/audio/plasma5-plasma-pa/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1591291425
-SHA256 (KDE/plasma/5.19.0/plasma-pa-5.19.0.tar.xz) = 808c3e62fa52d07e8f9af7854f1eee4a35e7cdb038e2b9db1ad0008121805aa6
-SIZE (KDE/plasma/5.19.0/plasma-pa-5.19.0.tar.xz) = 108924
+TIMESTAMP = 1592322970
+SHA256 (KDE/plasma/5.19.1/plasma-pa-5.19.1.tar.xz) = b958a0822687f12e5e3fd2d01970f375df9baadbe7db0ae2c6fa0b7d1a102cd8
+SIZE (KDE/plasma/5.19.1/plasma-pa-5.19.1.tar.xz) = 108508
--- a/audio/rhvoice/Makefile
+++ b/audio/rhvoice/Makefile
@ -1,7 +1,8 @@
 # $FreeBSD$

 PORTNAME=	RHVoice
-DISTVERSION=	1.0.0
+DISTVERSION=	1.2.2-7
+DISTVERSIONSUFFIX=	-g834198f
 CATEGORIES=	audio

 MAINTAINER=	yuri@FreeBSD.org
--- a/audio/rhvoice/distinfo
+++ b/audio/rhvoice/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1577777699
-SHA256 (Olga-Yakovleva-RHVoice-1.0.0_GH0.tar.gz) = 981ae31a488539abf03032a2c64e3b1d42b40f5832a25d217b7b459842ca5bcd
-SIZE (Olga-Yakovleva-RHVoice-1.0.0_GH0.tar.gz) = 164251081
+TIMESTAMP = 1592349037
+SHA256 (Olga-Yakovleva-RHVoice-1.2.2-7-g834198f_GH0.tar.gz) = 688826e108b194ed0909ece4445e1f2cde2ee7babc9fbf7cfcfca8659c9ec4f9
+SIZE (Olga-Yakovleva-RHVoice-1.2.2-7-g834198f_GH0.tar.gz) = 163720685
--- a/audio/rhvoice/pkg-plist
+++ b/audio/rhvoice/pkg-plist
@ -4,15 +4,16 @@ bin/sd_rhvoice
 include/RHVoice.h
 include/RHVoice_common.h
 lib/libRHVoice.so
-lib/libRHVoice.so.4
-lib/libRHVoice.so.4.0.0
+lib/libRHVoice.so.5
+lib/libRHVoice.so.5.0.0
 lib/libRHVoice_audio.so
 lib/libRHVoice_audio.so.1
-lib/libRHVoice_audio.so.1.0.0
+lib/libRHVoice_audio.so.1.1.0
 lib/libRHVoice_core.so
-lib/libRHVoice_core.so.2
-lib/libRHVoice_core.so.2.0.0
+lib/libRHVoice_core.so.3
+lib/libRHVoice_core.so.3.0.1
 %%DATADIR%%/languages/Brazilian-Portuguese/downcase.fst
+%%DATADIR%%/languages/Brazilian-Portuguese/dur-mod.dt
 %%DATADIR%%/languages/Brazilian-Portuguese/emoji.fst
 %%DATADIR%%/languages/Brazilian-Portuguese/g2p.fst
 %%DATADIR%%/languages/Brazilian-Portuguese/gpos.fst
@ -25,6 +26,8 @@ lib/libRHVoice_core.so.2.0.0
 %%DATADIR%%/languages/Brazilian-Portuguese/numbers.fst
 %%DATADIR%%/languages/Brazilian-Portuguese/phonemes.xml
 %%DATADIR%%/languages/Brazilian-Portuguese/phrasing.dt
+%%DATADIR%%/languages/Brazilian-Portuguese/pitch-mod.dt
+%%DATADIR%%/languages/Brazilian-Portuguese/qst.fst
 %%DATADIR%%/languages/Brazilian-Portuguese/spell.fst
 %%DATADIR%%/languages/Brazilian-Portuguese/syl.fst
 %%DATADIR%%/languages/Brazilian-Portuguese/tok.fst
@ -92,6 +95,8 @@ lib/libRHVoice_core.so.2.0.0
 %%DATADIR%%/languages/Russian/numbers.fst
 %%DATADIR%%/languages/Russian/phonemes.xml
 %%DATADIR%%/languages/Russian/phrasing.dt
+%%DATADIR%%/languages/Russian/pitch-mod.dt
+%%DATADIR%%/languages/Russian/qst.fst
 %%DATADIR%%/languages/Russian/rulex_dict.fst
 %%DATADIR%%/languages/Russian/rulex_rules.fst
 %%DATADIR%%/languages/Russian/spell.fst
@ -136,46 +141,47 @@ lib/libRHVoice_core.so.2.0.0
 %%DATADIR%%/languages/Ukrainian/syl.fst
 %%DATADIR%%/languages/Ukrainian/tok.fst
 %%DATADIR%%/languages/Ukrainian/untranslit.fst
-%%DATADIR%%/voices/Leticia-VOISS/16000/bap.pdf
-%%DATADIR%%/voices/Leticia-VOISS/16000/bap.win1
-%%DATADIR%%/voices/Leticia-VOISS/16000/bap.win2
-%%DATADIR%%/voices/Leticia-VOISS/16000/bap.win3
-%%DATADIR%%/voices/Leticia-VOISS/16000/bpf.txt
-%%DATADIR%%/voices/Leticia-VOISS/16000/dur.pdf
-%%DATADIR%%/voices/Leticia-VOISS/16000/lf0.pdf
-%%DATADIR%%/voices/Leticia-VOISS/16000/lf0.win1
-%%DATADIR%%/voices/Leticia-VOISS/16000/lf0.win2
-%%DATADIR%%/voices/Leticia-VOISS/16000/lf0.win3
-%%DATADIR%%/voices/Leticia-VOISS/16000/mgc.pdf
-%%DATADIR%%/voices/Leticia-VOISS/16000/mgc.win1
-%%DATADIR%%/voices/Leticia-VOISS/16000/mgc.win2
-%%DATADIR%%/voices/Leticia-VOISS/16000/mgc.win3
-%%DATADIR%%/voices/Leticia-VOISS/16000/tree-bap.inf
-%%DATADIR%%/voices/Leticia-VOISS/16000/tree-dur.inf
-%%DATADIR%%/voices/Leticia-VOISS/16000/tree-lf0.inf
-%%DATADIR%%/voices/Leticia-VOISS/16000/tree-mgc.inf
-%%DATADIR%%/voices/Leticia-VOISS/16000/voice.data
-%%DATADIR%%/voices/Leticia-VOISS/24000/bap.pdf
-%%DATADIR%%/voices/Leticia-VOISS/24000/bap.win1
-%%DATADIR%%/voices/Leticia-VOISS/24000/bap.win2
-%%DATADIR%%/voices/Leticia-VOISS/24000/bap.win3
-%%DATADIR%%/voices/Leticia-VOISS/24000/bpf.txt
-%%DATADIR%%/voices/Leticia-VOISS/24000/dur.pdf
-%%DATADIR%%/voices/Leticia-VOISS/24000/lf0.pdf
-%%DATADIR%%/voices/Leticia-VOISS/24000/lf0.win1
-%%DATADIR%%/voices/Leticia-VOISS/24000/lf0.win2
-%%DATADIR%%/voices/Leticia-VOISS/24000/lf0.win3
-%%DATADIR%%/voices/Leticia-VOISS/24000/mgc.pdf
-%%DATADIR%%/voices/Leticia-VOISS/24000/mgc.win1
-%%DATADIR%%/voices/Leticia-VOISS/24000/mgc.win2
-%%DATADIR%%/voices/Leticia-VOISS/24000/mgc.win3
-%%DATADIR%%/voices/Leticia-VOISS/24000/tree-bap.inf
-%%DATADIR%%/voices/Leticia-VOISS/24000/tree-dur.inf
-%%DATADIR%%/voices/Leticia-VOISS/24000/tree-lf0.inf
-%%DATADIR%%/voices/Leticia-VOISS/24000/tree-mgc.inf
-%%DATADIR%%/voices/Leticia-VOISS/24000/voice.data
-%%DATADIR%%/voices/Leticia-VOISS/voice.info
-%%DATADIR%%/voices/Leticia-VOISS/voice.params
+%%DATADIR%%/languages/Ukrainian/userdict/src/dictionary.txt
+%%DATADIR%%/voices/Leticia-F123/16000/bap.pdf
+%%DATADIR%%/voices/Leticia-F123/16000/bap.win1
+%%DATADIR%%/voices/Leticia-F123/16000/bap.win2
+%%DATADIR%%/voices/Leticia-F123/16000/bap.win3
+%%DATADIR%%/voices/Leticia-F123/16000/bpf.txt
+%%DATADIR%%/voices/Leticia-F123/16000/dur.pdf
+%%DATADIR%%/voices/Leticia-F123/16000/lf0.pdf
+%%DATADIR%%/voices/Leticia-F123/16000/lf0.win1
+%%DATADIR%%/voices/Leticia-F123/16000/lf0.win2
+%%DATADIR%%/voices/Leticia-F123/16000/lf0.win3
+%%DATADIR%%/voices/Leticia-F123/16000/mgc.pdf
+%%DATADIR%%/voices/Leticia-F123/16000/mgc.win1
+%%DATADIR%%/voices/Leticia-F123/16000/mgc.win2
+%%DATADIR%%/voices/Leticia-F123/16000/mgc.win3
+%%DATADIR%%/voices/Leticia-F123/16000/tree-bap.inf
+%%DATADIR%%/voices/Leticia-F123/16000/tree-dur.inf
+%%DATADIR%%/voices/Leticia-F123/16000/tree-lf0.inf
+%%DATADIR%%/voices/Leticia-F123/16000/tree-mgc.inf
+%%DATADIR%%/voices/Leticia-F123/16000/voice.data
+%%DATADIR%%/voices/Leticia-F123/24000/bap.pdf
+%%DATADIR%%/voices/Leticia-F123/24000/bap.win1
+%%DATADIR%%/voices/Leticia-F123/24000/bap.win2
+%%DATADIR%%/voices/Leticia-F123/24000/bap.win3
+%%DATADIR%%/voices/Leticia-F123/24000/bpf.txt
+%%DATADIR%%/voices/Leticia-F123/24000/dur.pdf
+%%DATADIR%%/voices/Leticia-F123/24000/lf0.pdf
+%%DATADIR%%/voices/Leticia-F123/24000/lf0.win1
+%%DATADIR%%/voices/Leticia-F123/24000/lf0.win2
+%%DATADIR%%/voices/Leticia-F123/24000/lf0.win3
+%%DATADIR%%/voices/Leticia-F123/24000/mgc.pdf
+%%DATADIR%%/voices/Leticia-F123/24000/mgc.win1
+%%DATADIR%%/voices/Leticia-F123/24000/mgc.win2
+%%DATADIR%%/voices/Leticia-F123/24000/mgc.win3
+%%DATADIR%%/voices/Leticia-F123/24000/tree-bap.inf
+%%DATADIR%%/voices/Leticia-F123/24000/tree-dur.inf
+%%DATADIR%%/voices/Leticia-F123/24000/tree-lf0.inf
+%%DATADIR%%/voices/Leticia-F123/24000/tree-mgc.inf
+%%DATADIR%%/voices/Leticia-F123/24000/voice.data
+%%DATADIR%%/voices/Leticia-F123/voice.info
+%%DATADIR%%/voices/Leticia-F123/voice.params
 %%DATADIR%%/voices/alan/16000/bap.pdf
 %%DATADIR%%/voices/alan/16000/bap.win1
 %%DATADIR%%/voices/alan/16000/bap.win2
--- a/audio/supercollider/Makefile
+++ b/audio/supercollider/Makefile
@ -1,11 +1,10 @@
 # $FreeBSD$

 PORTNAME=	supercollider
-DISTVERSION=	3.10.2
-PORTREVISION=	3
+DISTVERSION=	3.11.0
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/supercollider/supercollider/releases/download/Version-${PORTVERSION}/
-DISTNAME=	SuperCollider-${PORTVERSION}-Source-linux
+DISTNAME=	SuperCollider-${PORTVERSION}-Source

 MAINTAINER=	ports@nicandneal.net
 COMMENT=	Programming language for real time audio synthesis
@ -13,14 +12,11 @@ COMMENT=	Programming language for real time audio synthesis
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING

-BROKEN_FreeBSD=	fails to compile with Clang 8 due shipped Boost 1.66 libraries. Not compatible with Boost 1.70+, either
-
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/intrusive/unordered_set.hpp:devel/boost-libs
-LIB_DEPENDS=	libavahi-client.so:net/avahi-app \
-		libavahi-common.so:net/avahi-app \
+LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libjack.so:audio/jack \
 		libsndfile.so:audio/libsndfile \
-		libfftw3f.so:math/fftw3-float
+		libfftw3f.so:math/fftw3-float \
+		libyaml-cpp.so:devel/yaml-cpp

 USES=		cmake compiler:c++11-lang iconv localbase pkgconfig \
 		qt:5 readline shared-mime-info tar:bzip2 xorg
@ -30,23 +26,27 @@ USE_QT=		buildtools_build concurrent core declarative gui linguisttools location
 USE_XORG=	x11
 USE_LDCONFIG=	yes

-WRKSRC=		${WRKDIR}/SuperCollider-Source
-
 CMAKE_ARGS=	-DCMAKE_PREFIX_PATH=${LOCALBASE}/lib/qt5 \
 		-DLIBUSB_1_INCLUDE_DIR=/usr/include \
 		-DLIBUSB_1_LIBRARY=/usr/lib/libusb.so \
-		-DLIBSCSYNTH=ON
+		-DLIBSCSYNTH=ON \
+		-DSYSTEM_BOOST=ON \
+		-DSYSTEM_YAMLCPP=ON \
+		-DSC_ABLETON_LINK=OFF

 DESKTOP_ENTRIES="SuperCollider IDE" "" "${LOCALBASE}/share/pixmaps/sc_ide.svg" \
 		"scide" "" false

-OPTIONS_DEFINE=		HELP SUPERNOVA
-OPTIONS_DEFAULT=	HELP SUPERNOVA
+OPTIONS_DEFINE=		AVAHI HELP SUPERNOVA
+OPTIONS_DEFAULT=	AVAHI HELP SUPERNOVA
 OPTIONS_SUB=	yes

 HELP_DESC=	Install on-line help text
 SUPERNOVA_DESC=	Build with supernova as optional audio synthesis server

+AVAHI_LIB_DEPENDS=	libavahi-client.so:net/avahi-app \
+			libavahi-common.so:net/avahi-app
+AVAHI_CMAKE_BOOL_OFF=	NO_AVAHI
 HELP_CMAKE_BOOL=	INSTALL_HELP
 SUPERNOVA_CMAKE_BOOL=	SUPERNOVA

@ -56,13 +56,4 @@ SUPERNOVA_CMAKE_BOOL=	SUPERNOVA
 CMAKE_ARGS+=	-DSSE:BOOL=FALSE -DSSE2:BOOL=FALSE
 .endif

-post-patch:
-	@${REINPLACE_CMD} -e 's|MATCHES "Linux" AND|MATCHES "FreeBSD" AND|' \
-		${WRKSRC}/CMakeLists.txt
-	@${REINPLACE_CMD} -e 's|if(DL)|if(TRUE)|; s|target_link_libraries(libsupernova $${DL})|#|' \
-		${WRKSRC}/server/supernova/CMakeLists.txt
-	@${REINPLACE_CMD} -e 's|CMAKE_SYSTEM_NAME MATCHES "Linux"|CMAKE_SYSTEM_NAME MATCHES "FreeBSD"|' \
-		${WRKSRC}/server/plugins/CMakeLists.txt
-	@${REINPLACE_CMD} -e 's|__linux__|__FreeBSD__|' ${WRKSRC}/server/supernova/server/main.cpp
-
 .include <bsd.port.post.mk>
--- a/audio/supercollider/distinfo
+++ b/audio/supercollider/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1558424872
-SHA256 (SuperCollider-3.10.2-Source-linux.tar.bz2) = 389a9b3ecad7907c31f97566a48a8b2c5c53b73a8ad8004f81a5e9cb9a0fdf7a
-SIZE (SuperCollider-3.10.2-Source-linux.tar.bz2) = 11366481
+TIMESTAMP = 1588924328
+SHA256 (SuperCollider-3.11.0-Source.tar.bz2) = 37592a32108757bf282575f0d3b0e373bae9dbce6cf990282ea85299b13eb250
+SIZE (SuperCollider-3.11.0-Source.tar.bz2) = 18125654
--- a/audio/supercollider/files/patch-QtCollider_primitives_prim__QPen.cpp
+++ b/audio/supercollider/files/patch-QtCollider_primitives_prim__QPen.cpp
@ -0,0 +1,10 @@
+--- QtCollider/primitives/prim_QPen.cpp.orig	2020-06-15 00:38:04 UTC
+++ QtCollider/primitives/prim_QPen.cpp
+@@ -27,6 +27,7 @@
+ #include "PyrKernel.h"
+ 
+ #include <QPainter>
+#include <QPainterPath>
+ #include <QVector2D>
+ #include <QVector3D>
+ #include <cmath>
--- a/audio/supercollider/files/patch-QtCollider_widgets_QcGraph.cpp
+++ b/audio/supercollider/files/patch-QtCollider_widgets_QcGraph.cpp
@ -0,0 +1,10 @@
+--- QtCollider/widgets/QcGraph.cpp.orig	2020-06-15 01:27:43 UTC
+++ QtCollider/widgets/QcGraph.cpp
+@@ -24,6 +24,7 @@
+ #include "../style/routines.hpp"
+ 
+ #include <QPainter>
+#include <QPainterPath>
+ #include <QMouseEvent>
+ #include <QApplication>
+ #include <QtCore/qmath.h>
--- a/audio/supercollider/files/patch-QtCollider_widgets_QcLevelIndicator.cpp
+++ b/audio/supercollider/files/patch-QtCollider_widgets_QcLevelIndicator.cpp
@ -0,0 +1,10 @@
+--- QtCollider/widgets/QcLevelIndicator.cpp.orig	2020-06-15 01:16:56 UTC
+++ QtCollider/widgets/QcLevelIndicator.cpp
+@@ -23,6 +23,7 @@
+ #include "../QcWidgetFactory.h"
+ 
+ #include <QPainter>
+#include <QPainterPath>
+ 
+ QC_DECLARE_QWIDGET_FACTORY(QcLevelIndicator);
+ 
--- a/audio/supercollider/files/patch-QtCollider_widgets_QcMultiSlider.cpp
+++ b/audio/supercollider/files/patch-QtCollider_widgets_QcMultiSlider.cpp
@ -0,0 +1,10 @@
+--- QtCollider/widgets/QcMultiSlider.cpp.orig	2020-06-15 00:48:09 UTC
+++ QtCollider/widgets/QcMultiSlider.cpp
+@@ -26,6 +26,7 @@
+ #include <QApplication>
+ #include <QMouseEvent>
+ #include <QPainter>
+#include <QPainterPath>
+ 
+ #include <cmath>
+ 
--- a/audio/supercollider/files/patch-QtCollider_widgets_QcScopeShm.cpp
+++ b/audio/supercollider/files/patch-QtCollider_widgets_QcScopeShm.cpp
@ -0,0 +1,10 @@
+--- QtCollider/widgets/QcScopeShm.cpp.orig	2020-06-15 01:00:40 UTC
+++ QtCollider/widgets/QcScopeShm.cpp
+@@ -25,6 +25,7 @@
+ #include "../debug.h"
+ 
+ #include <QPainter>
+#include <QPainterPath>
+ #include <QTimer>
+ #include <QResizeEvent>
+ #include <QWindow>
--- a/audio/supercollider/files/patch-QtCollider_widgets_soundfileview_view.cpp
+++ b/audio/supercollider/files/patch-QtCollider_widgets_soundfileview_view.cpp
@ -0,0 +1,10 @@
+--- QtCollider/widgets/soundfileview/view.cpp.orig	2020-06-15 01:36:47 UTC
+++ QtCollider/widgets/soundfileview/view.cpp
+@@ -24,6 +24,7 @@
+ 
+ #include <QGridLayout>
+ #include <QPainter>
+#include <QPainterPath>
+ #include <QApplication>
+ #include <QPaintEvent>
+ #include <QCursor>
--- a/audio/supercollider/files/patch-external__libraries_CMakeLists.txt
+++ b/audio/supercollider/files/patch-external__libraries_CMakeLists.txt
@ -1,14 +0,0 @@
--- external_libraries/CMakeLists.txt.orig	2019-05-24 16:22:36.227027000 +0000
-+++ external_libraries/CMakeLists.txt	2019-05-24 16:23:37.721453000 +0000
-@@ -52,8 +52,10 @@
- 	endif()
- 
- 
-	if(CMAKE_SYSTEM_NAME MATCHES "Linux")
-+	if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
- 		target_compile_options(boost_thread PRIVATE -fPIC)
-+		target_compile_options(boost_system PRIVATE -fPIC)
-+		target_compile_options(boost_filesystem PRIVATE -fPIC)
- 		target_link_libraries(boost_thread rt)
- 	endif()
- 
--- a/audio/supercollider/pkg-plist
+++ b/audio/supercollider/pkg-plist
@ -485,6 +485,7 @@ share/SuperCollider/HID_Support/hut/hut_8_ledpage.yaml
 %%HELP%%share/SuperCollider/HelpSource/Classes/Line.schelp
 %%HELP%%share/SuperCollider/HelpSource/Classes/LineLayout.schelp
 %%HELP%%share/SuperCollider/HelpSource/Classes/Linen.schelp
+%%HELP%%share/SuperCollider/HelpSource/Classes/LinkClock.schelp
 %%HELP%%share/SuperCollider/HelpSource/Classes/LinkedList.schelp
 %%HELP%%share/SuperCollider/HelpSource/Classes/LinkedListNode.schelp
 %%HELP%%share/SuperCollider/HelpSource/Classes/List.schelp
@ -521,6 +522,7 @@ share/SuperCollider/HID_Support/hut/hut_8_ledpage.yaml
 %%HELP%%share/SuperCollider/HelpSource/Classes/Menu.schelp
 %%HELP%%share/SuperCollider/HelpSource/Classes/MenuAction.schelp
 %%HELP%%share/SuperCollider/HelpSource/Classes/Message.schelp
+%%HELP%%share/SuperCollider/HelpSource/Classes/MeterSync.schelp
 %%HELP%%share/SuperCollider/HelpSource/Classes/Method.schelp
 %%HELP%%share/SuperCollider/HelpSource/Classes/MidEQ.schelp
 %%HELP%%share/SuperCollider/HelpSource/Classes/Mix.schelp
@ -697,6 +699,7 @@ share/SuperCollider/HID_Support/hut/hut_8_ledpage.yaml
 %%HELP%%share/SuperCollider/HelpSource/Classes/Pgauss.schelp
 %%HELP%%share/SuperCollider/HelpSource/Classes/Pgbrown.schelp
 %%HELP%%share/SuperCollider/HelpSource/Classes/Pgeom.schelp
+%%HELP%%share/SuperCollider/HelpSource/Classes/Pget.schelp
 %%HELP%%share/SuperCollider/HelpSource/Classes/Pgpar.schelp
 %%HELP%%share/SuperCollider/HelpSource/Classes/Pgroup.schelp
 %%HELP%%share/SuperCollider/HelpSource/Classes/Phasor.schelp
@ -716,6 +719,7 @@ share/SuperCollider/HID_Support/hut/hut_8_ledpage.yaml
 %%HELP%%share/SuperCollider/HelpSource/Classes/Plazy.schelp
 %%HELP%%share/SuperCollider/HelpSource/Classes/PlazyEnvir.schelp
 %%HELP%%share/SuperCollider/HelpSource/Classes/PlazyEnvirN.schelp
+%%HELP%%share/SuperCollider/HelpSource/Classes/Plet.schelp
 %%HELP%%share/SuperCollider/HelpSource/Classes/Plotter.schelp
 %%HELP%%share/SuperCollider/HelpSource/Classes/Plprand.schelp
 %%HELP%%share/SuperCollider/HelpSource/Classes/Pluck.schelp
@ -778,6 +782,7 @@ share/SuperCollider/HID_Support/hut/hut_8_ledpage.yaml
 %%HELP%%share/SuperCollider/HelpSource/Classes/Psync.schelp
 %%HELP%%share/SuperCollider/HelpSource/Classes/Ptime.schelp
 %%HELP%%share/SuperCollider/HelpSource/Classes/Ptpar.schelp
+%%HELP%%share/SuperCollider/HelpSource/Classes/Ptrace.schelp
 %%HELP%%share/SuperCollider/HelpSource/Classes/Ptuple.schelp
 %%HELP%%share/SuperCollider/HelpSource/Classes/Pulse.schelp
 %%HELP%%share/SuperCollider/HelpSource/Classes/PulseCount.schelp
@ -930,7 +935,6 @@ share/SuperCollider/HID_Support/hut/hut_8_ledpage.yaml
 %%HELP%%share/SuperCollider/HelpSource/Classes/TChoose.schelp
 %%HELP%%share/SuperCollider/HelpSource/Classes/TDelay.schelp
 %%HELP%%share/SuperCollider/HelpSource/Classes/TDuty.schelp
-%%HELP%%share/SuperCollider/HelpSource/Classes/TDuty_old.schelp
 %%HELP%%share/SuperCollider/HelpSource/Classes/TExpRand.schelp
 %%HELP%%share/SuperCollider/HelpSource/Classes/TGrains.schelp
 %%HELP%%share/SuperCollider/HelpSource/Classes/TIRand.schelp
@ -1003,12 +1007,10 @@ share/SuperCollider/HID_Support/hut/hut_8_ledpage.yaml
 %%HELP%%share/SuperCollider/HelpSource/Classes/ZeroCrossing.schelp
 %%HELP%%share/SuperCollider/HelpSource/Classes/chebyshevpolynomials.png
 %%HELP%%share/SuperCollider/HelpSource/Guides/.placeholder
-%%HELP%%share/SuperCollider/HelpSource/Guides/AggregateDevice.schelp
 %%HELP%%share/SuperCollider/HelpSource/Guides/Backwards-Compatibility.schelp
 %%HELP%%share/SuperCollider/HelpSource/Guides/Bundled-Messages.schelp
 %%HELP%%share/SuperCollider/HelpSource/Guides/ClientVsServer.schelp
 %%HELP%%share/SuperCollider/HelpSource/Guides/Debugging-tips.schelp
-%%HELP%%share/SuperCollider/HelpSource/Guides/EmacsGUI.schelp
 %%HELP%%share/SuperCollider/HelpSource/Guides/FFT-Overview.schelp
 %%HELP%%share/SuperCollider/HelpSource/Guides/GUI-Introduction.schelp
 %%HELP%%share/SuperCollider/HelpSource/Guides/GUI-Layout-Management.schelp
@ -1025,6 +1027,7 @@ share/SuperCollider/HID_Support/hut/hut_8_ledpage.yaml
 %%HELP%%share/SuperCollider/HelpSource/Guides/MultiClient_Setups.schelp
 %%HELP%%share/SuperCollider/HelpSource/Guides/Multichannel-Expansion.schelp
 %%HELP%%share/SuperCollider/HelpSource/Guides/News-3_10.schelp
+%%HELP%%share/SuperCollider/HelpSource/Guides/News-3_11.schelp
 %%HELP%%share/SuperCollider/HelpSource/Guides/News-3_5.schelp
 %%HELP%%share/SuperCollider/HelpSource/Guides/News-3_6.schelp
 %%HELP%%share/SuperCollider/HelpSource/Guides/News-3_7.schelp
@ -1095,6 +1098,7 @@ share/SuperCollider/HID_Support/hut/hut_8_ledpage.yaml
 %%HELP%%share/SuperCollider/HelpSource/Reference/.placeholder
 %%HELP%%share/SuperCollider/HelpSource/Reference/Adverbs.schelp
 %%HELP%%share/SuperCollider/HelpSource/Reference/Assignment.schelp
+%%HELP%%share/SuperCollider/HelpSource/Reference/AudioDeviceSelection.schelp
 %%HELP%%share/SuperCollider/HelpSource/Reference/Classes.schelp
 %%HELP%%share/SuperCollider/HelpSource/Reference/Comments.schelp
 %%HELP%%share/SuperCollider/HelpSource/Reference/Control-Structures.schelp
@ -1319,6 +1323,7 @@ share/SuperCollider/SCClassLibrary/Common/Audio/TestUGens.sc
 share/SuperCollider/SCClassLibrary/Common/Audio/Trig.sc
 share/SuperCollider/SCClassLibrary/Common/Audio/UGen.sc
 share/SuperCollider/SCClassLibrary/Common/Audio/canFreeSynth.sc
+share/SuperCollider/SCClassLibrary/Common/Audio/iphone/iPhoneUGens.sc
 share/SuperCollider/SCClassLibrary/Common/Collections/Array.sc
 share/SuperCollider/SCClassLibrary/Common/Collections/Array2D.sc
 share/SuperCollider/SCClassLibrary/Common/Collections/ArrayedCollection.sc
@ -1346,6 +1351,8 @@ share/SuperCollider/SCClassLibrary/Common/Collections/SortedList.sc
 share/SuperCollider/SCClassLibrary/Common/Collections/SparseArray.sc
 share/SuperCollider/SCClassLibrary/Common/Collections/String.sc
 share/SuperCollider/SCClassLibrary/Common/Collections/linux/extString_linux.sc
+share/SuperCollider/SCClassLibrary/Common/Collections/osx/extString_osx.sc
+share/SuperCollider/SCClassLibrary/Common/Collections/windows/extString_windows.sc
 share/SuperCollider/SCClassLibrary/Common/Control/Buffer.sc
 share/SuperCollider/SCClassLibrary/Common/Control/Bus.sc
 share/SuperCollider/SCClassLibrary/Common/Control/Engine.sc
@ -1355,6 +1362,7 @@ share/SuperCollider/SCClassLibrary/Common/Control/HIDMatchers.sc
 share/SuperCollider/SCClassLibrary/Common/Control/HID_API.sc
 share/SuperCollider/SCClassLibrary/Common/Control/MIDIOut.sc
 share/SuperCollider/SCClassLibrary/Common/Control/MIDIResponder.sc
+share/SuperCollider/SCClassLibrary/Common/Control/MeterSync.sc
 share/SuperCollider/SCClassLibrary/Common/Control/NetAddr.sc
 share/SuperCollider/SCClassLibrary/Common/Control/Node.sc
 share/SuperCollider/SCClassLibrary/Common/Control/NodeControl.sc
@ -1482,6 +1490,9 @@ share/SuperCollider/SCClassLibrary/Common/GUI/backwardsCompatibility/classNameRe
 share/SuperCollider/SCClassLibrary/Common/GUI/backwardsCompatibility/deprecated-3.7.sc
 share/SuperCollider/SCClassLibrary/Common/GUI/backwardsCompatibility/flowViewSupportQt.sc
 share/SuperCollider/SCClassLibrary/Common/GUI/backwardsCompatibility/viewExtensions.sc
+share/SuperCollider/SCClassLibrary/Common/GUI/iphone/Base/GUIScreen.sc
+share/SuperCollider/SCClassLibrary/Common/GUI/iphone/Base/SCFont.sc
+share/SuperCollider/SCClassLibrary/Common/GUI/iphone/Base/SCView.sc
 share/SuperCollider/SCClassLibrary/Common/GUI/tools/HelpBrowser.sc
 share/SuperCollider/SCClassLibrary/Common/GUI/tools/Inspector.sc
 share/SuperCollider/SCClassLibrary/Common/GUI/tools/ServerMeter.sc
@ -1535,6 +1546,7 @@ share/SuperCollider/SCClassLibrary/Common/Streams/TabFileReader.sc
 share/SuperCollider/SCClassLibrary/Common/Streams/TimePatterns.sc
 share/SuperCollider/SCClassLibrary/Common/UnitTesting/MixedBundleTester.sc
 share/SuperCollider/SCClassLibrary/Common/UnitTesting/UnitTest.sc
+share/SuperCollider/SCClassLibrary/Common/UnitTesting/UnitTestGUI.sc
 share/SuperCollider/SCClassLibrary/Common/Unix/Unix.sc
 share/SuperCollider/SCClassLibrary/Common/Unix/UnixFILE.sc
 share/SuperCollider/SCClassLibrary/DefaultLibrary/Main.sc
@ -1572,11 +1584,23 @@ share/SuperCollider/SCClassLibrary/JITLib/ProxySpace/extStoreOn.sc
 share/SuperCollider/SCClassLibrary/JITLib/ProxySpace/operators.sc
 share/SuperCollider/SCClassLibrary/JITLib/ProxySpace/wrapForNodeProxy.sc
 share/SuperCollider/SCClassLibrary/Platform/Platform.sc
+share/SuperCollider/SCClassLibrary/Platform/iphone/SystemOverwrites/extFile.sc
+share/SuperCollider/SCClassLibrary/Platform/iphone/extMain.sc
+share/SuperCollider/SCClassLibrary/Platform/iphone/iPhonePlatform.sc
 share/SuperCollider/SCClassLibrary/Platform/linux/LID.sc
 share/SuperCollider/SCClassLibrary/Platform/linux/LIDGui.sc
 share/SuperCollider/SCClassLibrary/Platform/linux/LinuxPlatform.sc
 share/SuperCollider/SCClassLibrary/Platform/linux/SystemOverwrites/extMIDIOut.sc
 share/SuperCollider/SCClassLibrary/Platform/linux/extMain.sc
+share/SuperCollider/SCClassLibrary/Platform/osx/ApplicationStart.sc
+share/SuperCollider/SCClassLibrary/Platform/osx/OSXPlatform.sc
+share/SuperCollider/SCClassLibrary/Platform/osx/extMIDIOut.sc
+share/SuperCollider/SCClassLibrary/Platform/osx/extMain.sc
+share/SuperCollider/SCClassLibrary/Platform/windows/SystemOverwrites/overwrites.sc
+share/SuperCollider/SCClassLibrary/Platform/windows/WindowsPlatform.sc
+share/SuperCollider/SCClassLibrary/Platform/windows/extMIDIOut.sc
+share/SuperCollider/SCClassLibrary/Platform/windows/extMain.sc
+share/SuperCollider/SCClassLibrary/Platform/windows/extServerOptions.sc
 share/SuperCollider/SCClassLibrary/SCDoc/Help.sc
 share/SuperCollider/SCClassLibrary/SCDoc/SCDoc.sc
 share/SuperCollider/SCClassLibrary/SCDoc/SCDocRenderer.sc
@ -1586,9 +1610,12 @@ share/SuperCollider/SCClassLibrary/deprecated/3.10/AudioIn.sc
 share/SuperCollider/SCClassLibrary/deprecated/3.10/File.sc
 share/SuperCollider/SCClassLibrary/deprecated/3.10/GUI/File.sc
 share/SuperCollider/SCClassLibrary/deprecated/3.10/GUI/QWebView.sc
+share/SuperCollider/SCClassLibrary/deprecated/3.10/Main.sc
+share/SuperCollider/SCClassLibrary/deprecated/3.10/Plotter.sc
 share/SuperCollider/SCClassLibrary/deprecated/3.10/deprecated-3.10.sc
 share/SuperCollider/SCClassLibrary/deprecated/3.10/osc/OSCpathResponder.sc
 share/SuperCollider/SCClassLibrary/deprecated/3.10/osc/OSCresponder.sc
+share/SuperCollider/SCClassLibrary/deprecated/3.11/deprecated-3.11.sc
 share/SuperCollider/SCClassLibrary/scide_scqt/ScIDE.sc
 share/SuperCollider/examples/GUI examples/ColorBrowser.scd
 share/SuperCollider/examples/GUI examples/GUI_examples1.scd
@ -1669,3 +1696,4 @@ share/mime/packages/supercollider.xml
 share/pixmaps/sc_ide.svg
 share/pixmaps/supercollider.png
 share/pixmaps/supercollider.xpm
+@dir share/SuperCollider/SCClassLibrary/External
--- a/audio/tamgamp-lv2/Makefile
+++ b/audio/tamgamp-lv2/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	tamgamp
 DISTVERSION=	g20200514
+PORTREVISION=	1
 CATEGORIES=	audio
 PKGNAMESUFFIX=	-lv2

@ -33,4 +34,12 @@ PLIST_FILES=	lib/lv2/tamgamp.lv2/manifest.ttl \
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lv2/tamgamp.lv2/tamgamp-lv2.so

+OPTIONS_DEFINE=	SSE AVX
+
+SSE_DESC=	Use SIMD SSE instructions
+SSE_MAKE_ARGS=	SSE_INSTR_SET="-mmmx -m3dnow -msse"
+
+AVX_DESC=	Use SIMD AVX instructions
+AVX_MAKE_ARGS=	AVX_INSTR_SET="-mavx -mvzeroupper"
+
 .include <bsd.port.mk>
--- a/audio/tamgamp-lv2/files/patch-src_dsp_Makefile
+++ b/audio/tamgamp-lv2/files/patch-src_dsp_Makefile
@ -0,0 +1,13 @@
+--- src/dsp/Makefile.orig	2020-06-17 00:38:49 UTC
+++ src/dsp/Makefile
+@@ -89,8 +89,8 @@ COMMON_DEPS             = common.cpp
+ ARM_DEPS                = arm.cpp
+ AARCH64_DEPS            = aarch64.cpp
+ 
+-SSE_INSTR_SET           = -mmmx -m3dnow -msse
+-AVX_INSTR_SET           = -mavx -mvzeroupper
+#SSE_INSTR_SET           = -mmmx -m3dnow -msse
+#AVX_INSTR_SET           = -mavx -mvzeroupper
+ 
+ FILE                    = $(@:$(OBJDIR)/%.o=%.cpp)
+ LINK_OBJECTS            = $(COMMON_IMPL) $(NATIVE_IMPL)
--- a/biology/libsbml/Makefile
+++ b/biology/libsbml/Makefile
@ -25,17 +25,15 @@ PLIST_SUB=	PORTVERSION=${PORTVERSION}
 OPTIONS_DEFINE=	EXAMPLES PYTHON RUBY
 OPTIONS_SUB=	yes

-PYTHON_BUILD_DEPENDS=	swig3.0:devel/swig30
+PYTHON_BUILD_DEPENDS=	swig:devel/swig
 PYTHON_USES=		python:2.7
 PYTHON_CMAKE_BOOL=	WITH_PYTHON
 PYTHON_CMAKE_ON=	-DPYTHON_EXECUTABLE="${PYTHON_CMD}" \
 			-DPYTHON_INCLUDE_DIR="${PYTHON_INCLUDEDIR}" \
 			-DPYTHON_LIBRARY="${PYTHONBASE}/lib/lib${PYTHON_VERSION}.so"
-PYTHON_BINARY_ALIAS=	swig=swig3.0
-RUBY_BUILD_DEPENDS=	swig3.0:devel/swig30
+RUBY_BUILD_DEPENDS=	swig:devel/swig
 RUBY_USE=		ruby=yes
 RUBY_CMAKE_BOOL=	WITH_RUBY
-RUBY_BINARY_ALIAS=	swig=swig3.0

 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g; /$${DOCUMENTATION_FILES}/ s|^|#|' ${WRKSRC}/CMakeLists.txt
--- a/biology/py-gffutils/Makefile
+++ b/biology/py-gffutils/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	gffutils
-DISTVERSION=	0.10
+DISTVERSION=	0.10.1
 CATEGORIES=	biology python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/biology/py-gffutils/distinfo
+++ b/biology/py-gffutils/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1577769138
-SHA256 (gffutils-0.10.tar.gz) = 9b1f5f30d93754e8c67503b94878dbd7d113a5acf8d04c4c363aa8a78a506b2d
-SIZE (gffutils-0.10.tar.gz) = 1541920
+TIMESTAMP = 1592273301
+SHA256 (gffutils-0.10.1.tar.gz) = a8fc39006d7aa353147238160640e2210b168f7849cb99896be3fc9441e351cb
+SIZE (gffutils-0.10.1.tar.gz) = 1542433
--- a/biology/py-loompy/Makefile
+++ b/biology/py-loompy/Makefile
@ -1,8 +1,7 @@
 # $FreeBSD$

 PORTNAME=	loompy
-DISTVERSION=	2.0.17
-PORTREVISION=	1
+DISTVERSION=	3.0.6
 CATEGORIES=	biology python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/biology/py-loompy/distinfo
+++ b/biology/py-loompy/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1549143296
-SHA256 (loompy-2.0.17.tar.gz) = fa608019cb29569704fefb07486f579e21bfc4dc5949fdf56b8e1b31ee6b2982
-SIZE (loompy-2.0.17.tar.gz) = 32011
+TIMESTAMP = 1592273431
+SHA256 (loompy-3.0.6.tar.gz) = 58e9763b8ab1af2a4a0e3805d120458b5184fd2b0f3031657ecce33c63ca4c46
+SIZE (loompy-3.0.6.tar.gz) = 41108
--- a/biology/seaview/Makefile
+++ b/biology/seaview/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	seaview
-PORTVERSION=	5.0.3
+PORTVERSION=	5.0.4
 PORTEPOCH=	1
 CATEGORIES=	biology
 MASTER_SITES=	ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/archive/
--- a/biology/seaview/distinfo
+++ b/biology/seaview/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1591949849
-SHA256 (seaview_5.0.3.tar.gz) = 3c17072f2947a859f61f8cd2f41874a795258650a7495565e900044683f73d38
-SIZE (seaview_5.0.3.tar.gz) = 472813
+TIMESTAMP = 1592674569
+SHA256 (seaview_5.0.4.tar.gz) = e153e7fe1dd0b466ce7a00e8b78d5d232aa26063ab82f78eb43811780c41d727
+SIZE (seaview_5.0.4.tar.gz) = 472837
--- a/biology/vsearch/Makefile
+++ b/biology/vsearch/Makefile
@ -2,7 +2,7 @@

 PORTNAME=		vsearch
 DISTVERSIONPREFIX=	v
-DISTVERSION=		2.14.2
+DISTVERSION=		2.15.0
 CATEGORIES=		biology

 MAINTAINER=	jwb@FreeBSD.org
--- a/biology/vsearch/distinfo
+++ b/biology/vsearch/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1581796821
-SHA256 (torognes-vsearch-v2.14.2_GH0.tar.gz) = 4eba7b28e23580a8874b528e5a7345938c8adfbf3fe7eccfe90b352dfc8a3506
-SIZE (torognes-vsearch-v2.14.2_GH0.tar.gz) = 239518
+TIMESTAMP = 1592661073
+SHA256 (torognes-vsearch-v2.15.0_GH0.tar.gz) = c5d6eca1e4bf0c6e28221356b806c1d2322b51c39f40888636ab094c4df2e231
+SIZE (torognes-vsearch-v2.15.0_GH0.tar.gz) = 241192
--- a/cad/freecad/Makefile
+++ b/cad/freecad/Makefile
@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE

 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyside2-tools>5.14.0:devel/pyside2-tools@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib@${PY_FLAVOR} \
-		swig3.0:devel/swig30
+		swig:devel/swig
 LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 		libfreetype.so:print/freetype2 \
 		${PY_BOOST} \
--- a/cad/graywolf/Makefile
+++ b/cad/graywolf/Makefile
@ -24,4 +24,6 @@ USE_LDCONFIG=	yes

 USE_GCC=	any # lots of obviously incorrect C where clang fails, which gcc nevertheless magically finds a way to compile

+CFLAGS+=	-fcommon
+
 .include <bsd.port.mk>
--- a/cad/kicad-devel/Makefile
+++ b/cad/kicad-devel/Makefile
@ -14,7 +14,7 @@ COMMENT=		Schematic and PCB editing software
 LICENSE=	GPLv3

 BUILD_DEPENDS=	${LOCALBASE}/include/glm/glm.hpp:math/glm \
-		${LOCALBASE}/bin/swig3.0:devel/swig30
+		${LOCALBASE}/bin/swig:devel/swig
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
 		libngspice.so:cad/ngspice_rework@shlib \
 		libTKernel.so:cad/opencascade \
--- a/cad/kicad/Makefile
+++ b/cad/kicad/Makefile
@ -13,7 +13,7 @@ COMMENT=	Schematic and PCB editing software
 LICENSE=	GPLv2

 BUILD_DEPENDS=	${LOCALBASE}/include/glm/glm.hpp:math/glm	\
-		swig3.0:devel/swig30
+		swig:devel/swig
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs	\
 		libngspice.so:cad/ngspice_rework@shlib	\
 		libTKernel.so:cad/opencascade		\
--- a/cad/netgen-lvs/Makefile
+++ b/cad/netgen-lvs/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	netgen
-DISTVERSION=	1.5.147
+DISTVERSION=	1.5.148
 CATEGORIES=	cad
 PKGNAMESUFFIX=	-lvs

--- a/cad/netgen-lvs/distinfo
+++ b/cad/netgen-lvs/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1591404238
-SHA256 (RTimothyEdwards-netgen-1.5.147_GH0.tar.gz) = 7a67085d59acbf174ca8ce32acbd0d87b3f5535cb1e1b0e7a234931469e8c159
-SIZE (RTimothyEdwards-netgen-1.5.147_GH0.tar.gz) = 519181
+TIMESTAMP = 1592546970
+SHA256 (RTimothyEdwards-netgen-1.5.148_GH0.tar.gz) = be24ddff07968603e079ca6a8747fd4317c99d4cc0549a662af65259de64030e
+SIZE (RTimothyEdwards-netgen-1.5.148_GH0.tar.gz) = 519284
--- a/cad/netgen/Makefile
+++ b/cad/netgen/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	netgen
-PORTVERSION=	6.2.2005
+PORTVERSION=	6.2.2006
 DISTVERSIONPREFIX=	v
 CATEGORIES=	cad

--- a/cad/netgen/distinfo
+++ b/cad/netgen/distinfo
@ -1,5 +1,5 @@
-TIMESTAMP = 1592070746
-SHA256 (NGSolve-netgen-v6.2.2005_GH0.tar.gz) = cc6f678a52e7218525a8181b09f37925566a4d4796113a61a8640c79185dcadb
-SIZE (NGSolve-netgen-v6.2.2005_GH0.tar.gz) = 3248335
+TIMESTAMP = 1592583322
+SHA256 (NGSolve-netgen-v6.2.2006_GH0.tar.gz) = b554b6f7eb36feac7d6f5ee33cd520403709af579ab982f07e31a2c579d93a66
+SIZE (NGSolve-netgen-v6.2.2006_GH0.tar.gz) = 3248805
 SHA256 (NGSolve-pybind11-v2.4.3_GH0.tar.gz) = 1eed57bc6863190e35637290f97a20c81cfe4d9090ac0a24f3bbf08f265eb71d
 SIZE (NGSolve-pybind11-v2.4.3_GH0.tar.gz) = 571127
--- a/cad/opensta/Makefile
+++ b/cad/opensta/Makefile
@ -10,7 +10,7 @@ COMMENT=	Gate level static timing verifier
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE

-BUILD_DEPENDS=	swig3.0:devel/swig30
+BUILD_DEPENDS=	swig:devel/swig
 LIB_DEPENDS=	libcudd.so:math/cudd

 USES=		bison compiler:c++11-lang cmake tcl
--- a/cad/z88/Makefile
+++ b/cad/z88/Makefile
@ -6,7 +6,7 @@ DISTVERSIONPREFIX=	v
 DISTVERSION=	15
 CATEGORIES=	cad

-MAINTAINER=	salvadore@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Compact Finite Element Analysis System

 LICENSE=	GPLv2+
--- a/comms/flmsg/Makefile
+++ b/comms/flmsg/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	flmsg
-DISTVERSION=	4.0.14
+DISTVERSION=	4.0.15
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.w1hkj.com/files/${PORTNAME}/

--- a/comms/flmsg/distinfo
+++ b/comms/flmsg/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1581132802
-SHA256 (flmsg-4.0.14.tar.gz) = 3e269eac7c3363454d07316a6c20b24379903c05f970044fee27ef3bb9ca3768
-SIZE (flmsg-4.0.14.tar.gz) = 874399
+TIMESTAMP = 1592348098
+SHA256 (flmsg-4.0.15.tar.gz) = 4edec5ec5d5a3678ea05972dbe3532aeee9b4ba70c61e2de0a8a512e89b8d8f3
+SIZE (flmsg-4.0.15.tar.gz) = 876141
--- a/comms/gnuradio/Makefile
+++ b/comms/gnuradio/Makefile
@ -29,7 +29,7 @@ BUILD_DEPENDS=	volk>0:devel/volk \
 		guile:lang/guile \
 		minixmlto:textproc/minixmlto \
 		sdl-config:devel/sdl12 \
-		swig3.0:devel/swig30 \
+		swig:devel/swig \
 		mpir>0:math/mpir \
 		xdg-open:devel/xdg-utils
 LIB_DEPENDS=	libcodec2.so:audio/codec2 \
@ -68,7 +68,7 @@ CMAKE_ARGS+=	-DCMAKE_INSTALL_RPATH:STRING="${LOCALBASE}/lib/gcc${_GCC_VER}" \
 		-DLOCALBASE:STRING="${LOCALBASE}" \
 		-DGR_PKG_DOC_DIR:STRING="${DOCSDIR}" \
 		-DPYTHON_EXECUTABLE:STRING="${PYTHON_CMD}" \
-		-DSWIG_EXECUTABLE:STRING="${LOCALBASE}/bin/swig3.0"\
+		-DSWIG_EXECUTABLE:STRING="${LOCALBASE}/bin/swig"\
 		-DXMLTO_EXECUTABLE:STRING=minixmlto \
 		-DENABLE_INTERNAL_VOLK:STRING="OFF"
 # for detailed debugging uncomment the next line
--- a/comms/hamlib/Makefile
+++ b/comms/hamlib/Makefile
@ -12,7 +12,7 @@ COMMENT=	Shared libraries for Amateur Radio Equipment Control Applications

 LICENSE=	LGPL20

-BUILD_DEPENDS=	swig3.0:devel/swig30
+BUILD_DEPENDS=	swig:devel/swig
 LIB_DEPENDS=	libltdl.so:devel/libltdl

 USES=		autoreconf gnome libtool:keepla pathfix perl5 pkgconfig python \
@ -34,7 +34,6 @@ CONFIGURE_ARGS=	--with-perl-binding \
 CONFIGURE_ENV=	LIBUSB_LIBS="-lusb"
 PLIST_SUB=	VER=${PORTVERSION} TCL_VER=${TCL_VER}
 INSTALL_TARGET=	install-strip
-BINARY_ALIAS=	swig=swig3.0
 INFO=		hamlib

 OPTIONS_DEFINE=	DOCS
--- a/comms/owfs/Makefile
+++ b/comms/owfs/Makefile
@ -109,8 +109,8 @@ PLIST_SUB+=			OWNETPYTHON="@comment "

 # If Perl, Python or PHP is requested, enable SWIG
 .if ${PORT_OPTIONS:MOWPERL} || ${PORT_OPTIONS:MOWPYTHON} || ${PORT_OPTIONS:MOWPHP}
-BUILD_DEPENDS+=			swig3.0:devel/swig30
-CONFIGURE_ARGS+=		--enable-swig SWIG=${LOCALBASE}/bin/swig3.0
+BUILD_DEPENDS+=			swig:devel/swig
+CONFIGURE_ARGS+=		--enable-swig SWIG=${LOCALBASE}/bin/swig
 .else
 CONFIGURE_ARGS+=		--disable-swig
 .endif
--- a/comms/xastir/Makefile
+++ b/comms/xastir/Makefile
@ -38,6 +38,7 @@ SHEBANG_REGEX=	./scripts/.*\.(sh|pl|py)
 USE_GITHUB=	yes
 GH_ACCOUNT=	Xastir
 GH_PROJECT=	Xastir
+CFLAGS+=	-fcommon

 SUB_FILES=	pkg-message

--- a/converters/p5-Text-Bidi/Makefile
+++ b/converters/p5-Text-Bidi/Makefile
@ -15,7 +15,7 @@ LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE

 BUILD_DEPENDS=	p5-ExtUtils-PkgConfig>=0:devel/p5-ExtUtils-PkgConfig \
-		swig3.0:devel/swig30
+		swig:devel/swig
 LIB_DEPENDS=	libfribidi.so:converters/fribidi

 USES=		perl5
--- a/databases/Makefile
+++ b/databases/Makefile
@ -23,6 +23,7 @@
    SUBDIR += apq-pgsql
    SUBDIR += arangodb32
    SUBDIR += arangodb33
+    SUBDIR += arrow
    SUBDIR += ateam_mysql_ldap_auth
    SUBDIR += autobackupmysql
    SUBDIR += automysqlbackup
--- a/databases/arrow/Makefile
+++ b/databases/arrow/Makefile
@ -0,0 +1,51 @@
+# $FreeBSD$
+
+PORTNAME=	arrow
+DISTVERSIONPREFIX=	${GH_ACCOUNT}-${PORTNAME}-
+DISTVERSION=	0.17.1
+CATEGORIES=	databases
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	Columnar in-memory analytics layer for big data
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/../LICENSE.txt
+
+LIB_DEPENDS=	libboost_system.so:devel/boost-libs
+
+USES=		cmake compiler:c++11-lang pkgconfig
+USE_GITHUB=	yes
+GH_ACCOUNT=	apache
+USE_LDCONFIG=	yes
+
+WRKSRC_SUBDIR=	cpp
+
+CMAKE_OFF=	ARROW_BUILD_STATIC
+
+OPTIONS_GROUP=		COMPRESSION
+OPTIONS_GROUP_COMPRESSION=	BROTLI BZ2 LZ4 SNAPPY ZLIB ZSTD
+OPTIONS_DEFAULT=	BROTLI BZ2 LZ4 SNAPPY ZLIB ZSTD
+
+COMPRESSION_DESC=	Compression support:
+
+BROTLI_CMAKE_BOOL=	ARROW_WITH_BROTLI
+BROTLI_LIB_DEPENDS=	libbrotlicommon.so:archivers/brotli
+
+BZ2_DESC=		bz2 compression support
+BZ2_CMAKE_BOOL=		ARROW_WITH_BZ2
+
+SNAPPY_CMAKE_BOOL=	ARROW_WITH_BZ2
+
+LZ4_CMAKE_BOOL=		ARROW_WITH_LZ4
+LZ4_LIB_DEPENDS=	liblz4.so:archivers/liblz4
+
+SNAPPY_CMAKE_BOOL=	ARROW_WITH_SNAPPY
+SNAPPY_LIB_DEPENDS=	libsnappy.so:archivers/snappy
+
+ZLIB_CMAKE_BOOL=	ARROW_WITH_ZLIB
+
+ZSTD_DESC=		zstd compression support
+ZSTD_CMAKE_BOOL=	ARROW_WITH_ZSTD
+ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
+
+.include <bsd.port.mk>
--- a/databases/arrow/distinfo
+++ b/databases/arrow/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1592320634
+SHA256 (apache-arrow-apache-arrow-0.17.1_GH0.tar.gz) = ecb6da20f9288c0ca31f9b457ffdd460198765a8af27c1cac4b1382a8d130f86
+SIZE (apache-arrow-apache-arrow-0.17.1_GH0.tar.gz) = 5834485
--- a/databases/arrow/files/patch-CMakeLists.txt
+++ b/databases/arrow/files/patch-CMakeLists.txt
@ -0,0 +1,26 @@
+--- CMakeLists.txt.orig	2020-05-14 11:07:56 UTC
+++ CMakeLists.txt
+@@ -63,7 +63,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CU
+ 
+ include(CMakePackageConfigHelpers)
+ include(CMakeParseArguments)
+-include(ExternalProject)
+#include(ExternalProject) # bundling isn't allowed
+ include(FindPkgConfig)
+ 
+ include(GNUInstallDirs)
+@@ -841,10 +841,10 @@ if(ARROW_BUILD_EXAMPLES)
+   add_subdirectory(examples/arrow)
+ endif()
+ 
+-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../LICENSE.txt
+-              ${CMAKE_CURRENT_SOURCE_DIR}/../NOTICE.txt
+-              ${CMAKE_CURRENT_SOURCE_DIR}/README.md
+-        DESTINATION "${ARROW_DOC_DIR}")
+#install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../LICENSE.txt
+#              ${CMAKE_CURRENT_SOURCE_DIR}/../NOTICE.txt
+#              ${CMAKE_CURRENT_SOURCE_DIR}/README.md
+#        DESTINATION "${ARROW_DOC_DIR}")
+ 
+ config_summary_message()
+ if(${ARROW_BUILD_CONFIG_SUMMARY_JSON})
--- a/databases/arrow/files/patch-cmake__modules_SetupCxxFlags.cmake
+++ b/databases/arrow/files/patch-cmake__modules_SetupCxxFlags.cmake
@ -0,0 +1,11 @@
+--- cmake_modules/SetupCxxFlags.cmake.orig	2020-06-15 16:23:49 UTC
+++ cmake_modules/SetupCxxFlags.cmake
+@@ -27,7 +27,7 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch
+   set(ARROW_CPU_FLAG "armv8")
+ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "armv7")
+   set(ARROW_CPU_FLAG "armv7")
+-elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "ppc")
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "powerpc|powerpc64|ppc")
+   set(ARROW_CPU_FLAG "ppc")
+ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "s390x")
+   set(ARROW_CPU_FLAG "s390x")
--- a/Show More
+++ b/Show More