*/*: sync with upstream

Taken from: FreeBSD
2021-11-01 15:57:04 +01:00 · 2021-11-01 15:57:04 +01:00 · ee2783e293
commit ee2783e293
parent 4b9df35308
1284 changed files with 23495 additions and 25337 deletions
--- a/accessibility/linux-c7-atk/Makefile
+++ b/accessibility/linux-c7-atk/Makefile
@ -15,7 +15,7 @@ USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes

-CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
+CONFLICTS=	linux-c6-${PORTNAME}
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr

 OPTIONS_DEFINE=	DOCS NLS
--- a/accessibility/orca/Makefile
+++ b/accessibility/orca/Makefile
@ -23,7 +23,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} \

 # conflict with py*-json-py because orca uses the json from python itself
 # and py*-json-py shadows this.
-CONFLICTS=	py*-json-py-[0-9]*
+CONFLICTS=	py*-json-py
 PORTSCOUT=	limitw:1,even

 NO_ARCH=	yes
--- a/archivers/Makefile
+++ b/archivers/Makefile
@ -13,6 +13,7 @@
    SUBDIR += bzip
    SUBDIR += bzip2
    SUBDIR += c-blosc
+    SUBDIR += c-blosc2
    SUBDIR += cabextract
    SUBDIR += cmdpack
    SUBDIR += dact
@ -114,6 +115,7 @@
    SUBDIR += p5-Compress-Raw-Lzma
    SUBDIR += p5-Compress-Raw-Zlib
    SUBDIR += p5-Compress-Snappy
+    SUBDIR += p5-Compress-Zstd
    SUBDIR += p5-Gzip-Faster
    SUBDIR += p5-IO-Compress
    SUBDIR += p5-IO-Compress-Brotli
--- a/archivers/c-blosc2/Makefile
+++ b/archivers/c-blosc2/Makefile
@ -0,0 +1,28 @@
+# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
+
+PORTNAME=	c-blosc2
+PORTVERSION=	2.0.4
+DISTVERSIONPREFIX=	v
+CATEGORIES=	archivers
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	High performance compressor optimized for binary data
+
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+
+LIB_DEPENDS=	liblz4.so:archivers/liblz4 \
+		libzstd.so:archivers/zstd
+
+USES=		cmake
+
+CMAKE_OFF=	BUILD_LITE DEACTIVATE_AVX2 DEACTIVATE_ZLIB DEACTIVATE_ZSTD
+CMAKE_ON=	BUILD_BENCHMARKS BUILD_EXAMPLES BUILD_FUZZERS BUILD_PLUGINS BUILD_SHARED BUILD_STATIC BUILD_TESTS DEACTIVATE_IPP PREFER_EXTERNAL_LZ4 PREFER_EXTERNAL_ZLIB PREFER_EXTERNAL_ZSTD TEST_INCLUDE_COMPAT TEST_INCLUDE_EXAMPLES
+USE_LDCONFIG=	yes
+
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
+
+GH_ACCOUNT=	Blosc
+USE_GITHUB=	yes
+
+.include <bsd.port.mk>
--- a/archivers/c-blosc2/distinfo
+++ b/archivers/c-blosc2/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1635730865
+SHA256 (Blosc-c-blosc2-v2.0.4_GH0.tar.gz) = 90c78edcc262759dd16d243141513310624bb4fda3d98ac34dcfb78255e151c1
+SIZE (Blosc-c-blosc2-v2.0.4_GH0.tar.gz) = 2062503
--- a/archivers/c-blosc2/pkg-descr
+++ b/archivers/c-blosc2/pkg-descr
@ -0,0 +1,14 @@
+Blosc is a high performance compressor optimized for binary data (i.e. floating
+point numbers, integers and booleans). It has been designed to transmit data to
+the processor cache faster than the traditional, non-compressed, direct memory
+fetch approach via a memcpy() OS call. Blosc main goal is not just to reduce the
+size of large datasets on-disk or in-memory, but also to accelerate memory-bound
+computations.
+
+C-Blosc2 is the new major version of C-Blosc, and tries hard to be backward
+compatible with both the C-Blosc1 API and its in-memory format. However, the
+reverse thing is generally not true; buffers generated with C-Blosc2 are not
+format-compatible with C-Blosc1 (i.e. forward compatibility is not supported).
+
+WWW: https://www.blosc.org/
+WWW: https://github.com/Blosc/c-blosc2
--- a/archivers/c-blosc2/pkg-plist
+++ b/archivers/c-blosc2/pkg-plist
@ -0,0 +1,11 @@
+include/blosc2.h
+include/blosc2/blosc2-common.h
+include/blosc2/blosc2-export.h
+include/blosc2/blosc2-stdio.h
+include/blosc2/codecs-registry.h
+include/blosc2/filters-registry.h
+lib/libblosc2.a
+lib/libblosc2.so
+lib/libblosc2.so.2
+lib/libblosc2.so.%%PORTVERSION%%
+libdata/pkgconfig/blosc2.pc
--- a/archivers/deco/Makefile
+++ b/archivers/deco/Makefile
@ -26,7 +26,7 @@ RUN_DEPENDS=	arc:archivers/arc \
 		zoo:archivers/zoo \
 		flac:audio/flac

-CONFLICTS=	deco-[0-9]*
+CONFLICTS=	deco

 post-patch:
 	@${CP} ${FILESDIR}/extract ${WRKDIR}/${PORTNAME}-archive-1.7/x/"tar\.xz"
--- a/archivers/lzma/Makefile
+++ b/archivers/lzma/Makefile
@ -9,7 +9,7 @@ DISTNAME=	lzma${PORTVERSION:S/.//g}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	High-ratio LZMA compressor

-CONFLICTS=	lzmautils-[0-9]* xz-[0-9]*
+CONFLICTS=	lzmautils xz

 USES=		7z gmake dos2unix
 NO_WRKSUBDIR=	yes
--- a/archivers/p5-Compress-Zstd/Makefile
+++ b/archivers/p5-Compress-Zstd/Makefile
@ -0,0 +1,23 @@
+# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
+
+PORTNAME=	Compress-Zstd
+PORTVERSION=	0.20
+CATEGORIES=	archivers perl5
+MASTER_SITES=	CPAN
+PKGNAMEPREFIX=	p5-
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Perl interface to the Zstd (Zstandard) (de)compressor
+
+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	gmake:devel/gmake
+
+USES=		perl5
+USE_PERL5=	modbuild
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Compress/Zstd/Zstd.so
+
+.include <bsd.port.mk>
--- a/archivers/p5-Compress-Zstd/distinfo
+++ b/archivers/p5-Compress-Zstd/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1635730871
+SHA256 (Compress-Zstd-0.20.tar.gz) = 149f1ebecfe05462a1dfbbcb7154ba2e404708b6ed886b03a601e75fd113eaf7
+SIZE (Compress-Zstd-0.20.tar.gz) = 2016888
--- a/archivers/p5-Compress-Zstd/pkg-descr
+++ b/archivers/p5-Compress-Zstd/pkg-descr
@ -0,0 +1,3 @@
+The Compress::Zstd module provides an interface to the Zstd (de)compressor.
+
+WWW: https://metacpan.org/dist/Compress-Zstd
--- a/archivers/p5-Compress-Zstd/pkg-plist
+++ b/archivers/p5-Compress-Zstd/pkg-plist
@ -0,0 +1,15 @@
+%%SITE_ARCH%%/Compress/Zstd.pm
+%%SITE_ARCH%%/Compress/Zstd/CompressionContext.pm
+%%SITE_ARCH%%/Compress/Zstd/CompressionDictionary.pm
+%%SITE_ARCH%%/Compress/Zstd/Compressor.pm
+%%SITE_ARCH%%/Compress/Zstd/DecompressionContext.pm
+%%SITE_ARCH%%/Compress/Zstd/DecompressionDictionary.pm
+%%SITE_ARCH%%/Compress/Zstd/Decompressor.pm
+%%SITE_ARCH%%/auto/Compress/Zstd/Zstd.so
+%%PERL5_MAN3%%/Compress::Zstd.3.gz
+%%PERL5_MAN3%%/Compress::Zstd::CompressionContext.3.gz
+%%PERL5_MAN3%%/Compress::Zstd::CompressionDictionary.3.gz
+%%PERL5_MAN3%%/Compress::Zstd::Compressor.3.gz
+%%PERL5_MAN3%%/Compress::Zstd::DecompressionContext.3.gz
+%%PERL5_MAN3%%/Compress::Zstd::DecompressionDictionary.3.gz
+%%PERL5_MAN3%%/Compress::Zstd::Decompressor.3.gz
--- a/archivers/par/Makefile
+++ b/archivers/par/Makefile
@ -11,7 +11,7 @@ COMMENT=	Archiver for Quake I and II packed data files

 LICENSE=	GPLv2

-CONFLICTS=	par-[0-9]*
+CONFLICTS=	par

 MAKEFILE=	Makefile.Linux
 MAKE_ARGS=	CC="${CC}"
--- a/archivers/par2cmdline/Makefile
+++ b/archivers/par2cmdline/Makefile
@ -17,7 +17,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	Parchive

 PORTDOCS=	README
-CONFLICTS=	par2cmdline-tbb-[0-9]*
+CONFLICTS=	par2cmdline-tbb

 PLIST_FILES=	bin/par2 bin/par2create bin/par2repair bin/par2verify man/man1/par2.1.gz

--- a/archivers/pigz/Makefile
+++ b/archivers/pigz/Makefile
@ -1,7 +1,7 @@
 # Created by: Gea-Suan Lin <gslin@gslin.org>

 PORTNAME=	pigz
-PORTVERSION=	2.4
+PORTVERSION=	2.6
 CATEGORIES=	archivers
 MASTER_SITES=	http://www.zlib.net/pigz/ \
 		http://freebsd.unixfreunde.de/sources/
--- a/archivers/pigz/distinfo
+++ b/archivers/pigz/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1514453386
-SHA256 (pigz-2.4.tar.gz) = a4f816222a7b4269bd232680590b579ccc72591f1bb5adafcd7208ca77e14f73
-SIZE (pigz-2.4.tar.gz) = 98234
+TIMESTAMP = 1635727738
+SHA256 (pigz-2.6.tar.gz) = 2eed7b0d7449d1d70903f2a62cd6005d262eb3a8c9e98687bc8cbb5809db2a7d
+SIZE (pigz-2.6.tar.gz) = 106840
--- a/archivers/squsq/Makefile
+++ b/archivers/squsq/Makefile
@ -9,7 +9,7 @@ DISTNAME=	t20-squsq-3.3
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Compressor/decompressor for CP/M "Squeeze" compressed files

-CONFLICTS=	squirrel-[0-9]*
+CONFLICTS=	squirrel
 WRKSRC=		${WRKDIR}/t20-squsq
 MAKEFILE=	${FILESDIR}/Makefile
 CFLAGS+=	-Wno-error=return-type
--- a/astro/gpsbabel/Makefile
+++ b/astro/gpsbabel/Makefile
@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 USES=		compiler:c++11-lang gmake localbase qt:5
 USE_QT=		core qmake_build

-CONFLICTS=	gpsbabel14-[0-9]*
+CONFLICTS=	gpsbabel14

 USE_GITHUB=	yes
 GNU_CONFIGURE=	yes
--- a/astro/gpsbabel14/Makefile
+++ b/astro/gpsbabel14/Makefile
@ -23,7 +23,7 @@ CONFIGURE_ARGS=	--with-expathdr=${LOCALBASE}/include \

 PLIST_FILES=	bin/gpsbabel

-CONFLICTS=	gpsbabel-[0-9]*
+CONFLICTS=	gpsbabel

 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/gpsbabel
--- a/astro/match/Makefile
+++ b/astro/match/Makefile
@ -11,7 +11,7 @@ COMMENT=	Program for matching star lists
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING

-CONFLICTS=	avenger-[0-9]*
+CONFLICTS=	avenger
 GNU_CONFIGURE=	yes

 .include <bsd.port.mk>
--- a/astro/py-pyerfa/Makefile
+++ b/astro/py-pyerfa/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	pyerfa
 DISTVERSION=	2.0.0
-CATEGORIES=	astro
+CATEGORIES=	astro python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

@ -10,13 +10,13 @@ COMMENT=	Python wrapper for the ERFA library
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.rst

-BUILD_DEPENDS=	${PYNUMPY} \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.17.0,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
-RUN_DEPENDS=	${PYNUMPY}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.17.0,1:math/py-numpy@${PY_FLAVOR}

-USES=		python:3.6+
+USES=		python:3.6-3.9
 USE_PYTHON=	autoplist distutils

 .include <bsd.port.mk>
--- a/audio/aacplusenc/Makefile
+++ b/audio/aacplusenc/Makefile
@ -24,7 +24,7 @@ OPTIONS_DEFINE=	FFTW3
 OPTIONS_DEFAULT=	FFTW3
 FFTW3_DESC=	Use FFTW3 library for performance

-CONFLICTS=	libaacplus-[0-9]*
+CONFLICTS=	libaacplus

 PLIST_FILES=	bin/aacplusenc
 MAKE_ARGS+=	INSTDIR=${STAGEDIR}${PREFIX}
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@ -1,11 +1,9 @@
 # Created by: Marc van Woerkom <3d@FreeBSD.org>

 PORTNAME=	audacity
-DISTVERSIONPREFIX=	minsrc-
-DISTVERSION=	3.0.2
-PORTREVISION=	1
+DISTVERSIONPREFIX=	Audacity-
+DISTVERSION=	3.0.5
 CATEGORIES=	audio
-MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/Audacity-${PORTVERSION}/

 MAINTAINER=	xxjack12xx@gmail.com
 COMMENT=	GUI editor for digital audio waveforms
@ -13,41 +11,51 @@ COMMENT=	GUI editor for digital audio waveforms
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt

+BUILD_DEPENDS=	conan:sysutils/conan
 LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 		libexpat.so:textproc/expat2 \
+		libmp3lame.so:audio/lame \
 		libportaudio.so:audio/portaudio \
+		libportmidi.so:audio/portmidi \
 		libsndfile.so:audio/libsndfile \
 		libsoxr.so:audio/libsoxr \
-		libsqlite3.so:databases/sqlite3
+		libsqlite3.so:databases/sqlite3 \
+		libuuid.so:misc/e2fsprogs-libuuid

 USES=		cmake compiler:c++14-lang cpe desktop-file-utils gettext \
-		gnome libtool python:build pkgconfig shared-mime-info tar:xz
-USE_GNOME=	cairo gtk30
+		gnome libtool python:build pkgconfig shared-mime-info
+
+USE_GITHUB=	yes
+USE_GNOME=	cairo gdkpixbuf2 gtk30
 USE_WX=		3.1+
 WX_COMPS=	wx
 PORTDOCS=	README.txt

 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_midi:STRING=system \
+		-Daudacity_use_nyquist:STRING=local \
 		-Daudacity_use_portsmf:STRING=local \
 		-Daudacity_use_portmixer:STRING=local \
-		-Daudacity_use_portaudio:STRING=system
-CMAKE_OFF=	audacity_use_pch
+		-Daudacity_use_portaudio:STRING=system \
+		-Daudacity_use_soxr:STRING=system \
+		-Daudacity_use_sndfile:STRING=system \
+		-Daudacity_use_sqlite:STRING=system \
+		-Daudacity_use_wxwidgets:STRING=system \
+		-Daudacity_use_zlib:STRING=system
+CMAKE_ON=	audacity_obey_system_dependencies
+CMAKE_OFF=	audacity_has_networking audacity_has_updates_check \
+		audacity_use_pa_alsa audacity_use_pch

-OPTIONS_DEFINE=		DEBUG DOCS FFMPEG FLAC ID3TAG LADSPA LAME LV2 MAD \
-			MIDI OGG SBSMS SOUNDTOUCH TWOLAME VAMP \
+OPTIONS_DEFINE=		DEBUG DOCS FFMPEG FLAC ID3TAG LADSPA LV2 MAD \
+			OGG SBSMS SOUNDTOUCH TWOLAME VAMP \
 			VORBIS VST
-OPTIONS_DEFAULT=	FFMPEG FLAC ID3TAG LV2 MAD MIDI OGG SBSMS \
+OPTIONS_DEFAULT=	FFMPEG FLAC ID3TAG LV2 MAD OGG SBSMS \
 			SOUNDTOUCH TWOLAME VAMP VORBIS VST
 OPTIONS_EXCLUDE_i386=	SBSMS

-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
-MIDI_DESC=		MIDI 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
@ -58,6 +66,7 @@ DEBUG_CMAKE_ON=		wxWidgets_USE_DEBUG

 DOCS_BUILD_DEPENDS=	docbook-to-man:textproc/docbook-to-man \
 			docbook2man:textproc/docbook-utils
+DOCS_LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz

 FFMPEG_CMAKE_ON=	-Daudacity_use_ffmpeg:STRING=loaded
 FFMPEG_CMAKE_OFF=	-Daudacity_use_ffmpeg:STRING=off
@ -68,20 +77,13 @@ FLAC_CMAKE_ON=		-Daudacity_use_flac:STRING=system
 FLAC_CMAKE_OFF=		-Daudacity_use_flac:STRING=local
 FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac

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

 LADSPA_CMAKE_BOOL=	audacity_use_ladspa
 LADSPA_RUN_DEPENDS=	listplugins:audio/ladspa

-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_CMAKE_ON=		-Daudacity_use_lv2:STRING=system
 LV2_CMAKE_OFF=		-Daudacity_use_lv2:STRING=off
 LV2_LIB_DEPENDS=	liblilv-0.so:audio/lilv \
@ -90,13 +92,10 @@ LV2_LIB_DEPENDS=	liblilv-0.so:audio/lilv \
 			libsratom-0.so:audio/sratom \
 			libsuil-0.so:audio/suil

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

-MIDI_CMAKE_ON=		-Daudacity_use_midi:STRING=local
-MIDI_CMAKE_OFF=		-Daudacity_use_midi:STRING=off
-
 # TODO: fix NLS support properly
 PLIST_SUB+=		NLS=""

@ -109,7 +108,7 @@ 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
+SOUNDTOUCH_LIB_DEPENDS=	libSoundTouch.so:audio/soundtouch

 TWOLAME_CMAKE_ON=	-Daudacity_use_twolame:STRING=system
 TWOLAME_CMAKE_OFF=	-Daudacity_use_twolame:STRING=off
@ -135,13 +134,13 @@ CMAKE_ARGS+=	-DHAVE_MMX:BOOL=OFF \
 .endif

 post-install:
-	@cd ${STAGEDIR}${PREFIX} && ${STRIP_CMD} \
-		bin/${PORTNAME} \
-		share/audacity/modules/mod-script-pipe.so
 	@${RM} ${STAGEDIR}${DOCSDIR}/LICENSE.txt
-	# delete empty directories: https://github.com/audacity/audacity/issues/808
+	#delete empty directories: https://github.com/audacity/audacity/issues/808
 	@${FIND} ${STAGEDIR} -type d -empty -delete

+post-install-DEBUG-off:
+	@${FIND} ${STAGEDIR}${PREFIX}/lib/audacity -name '*.so*' -exec ${STRIP_CMD} {} +
+
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
--- a/audio/audacity/distinfo
+++ b/audio/audacity/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1619066304
-SHA256 (audacity-minsrc-3.0.2.tar.xz) = 728d6459931da006ed45a31e63b7fe6ca47a2547459a2aff3bf0880cef85c296
-SIZE (audacity-minsrc-3.0.2.tar.xz) = 13330160
+TIMESTAMP = 1633473095
+SHA256 (audacity-audacity-Audacity-3.0.5_GH0.tar.gz) = 4b94dcaf45545ebf0d9a44b71fbdc1251109100b465ff4d71860849b5ffcf525
+SIZE (audacity-audacity-Audacity-3.0.5_GH0.tar.gz) = 63066756
--- a/audio/audacity/files/patch-cmake-proxies_CMakeLists.txt
+++ b/audio/audacity/files/patch-cmake-proxies_CMakeLists.txt
@ -1,7 +1,73 @@
--- cmake-proxies/CMakeLists.txt.orig	2021-02-04 18:52:51 UTC
+--- cmake-proxies/CMakeLists.txt.orig	2021-08-18 10:21:37 UTC
 +++ cmake-proxies/CMakeLists.txt
-@@ -132,7 +132,7 @@ addlib( expat              expat       EXPAT       YES
- addlib( lame               lame        LAME        YES   YES   "lame >= 3.100" )
+@@ -87,6 +87,7 @@ add_conan_lib(
+    REQUIRED
+    INTERFACE_NAME libmp3lame::libmp3lame
+    PKG_CONFIG "lame >= 3.100"
+   ALLOW_FIND_PACKAGE
+ )
+ 
+ add_conan_lib(
+@@ -105,24 +106,23 @@ add_conan_lib(
+    PKG_CONFIG "mad >= 0.15.1b"
+ )
+ 
+-if( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
+-   set( curl_ssl "darwinssl" )
+-elseif( CMAKE_SYSTEM_NAME MATCHES "Windows" )
+-   set( curl_ssl "schannel")
+-else()
+-   set ( curl_ssl "openssl" )
+-endif ()
+-
+-add_conan_lib(
+-   ThreadPool
+-   threadpool/20140926
+-   REQUIRED
+-   ALWAYS_ALLOW_CONAN_FALLBACK
+-)
+-
+ if( ${_OPT}has_networking )
+   if( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
+      set( curl_ssl "darwinssl" )
+   elseif( CMAKE_SYSTEM_NAME MATCHES "Windows" )
+      set( curl_ssl "schannel")
+   else()
+      set ( curl_ssl "openssl" )
+   endif ()
+ 
+    add_conan_lib(
+      ThreadPool
+      threadpool/20140926
+      REQUIRED
+      ALWAYS_ALLOW_CONAN_FALLBACK
+   )
+
+   add_conan_lib(
+       CURL
+       libcurl/7.75.0
+       REQUIRED
+@@ -148,11 +148,13 @@ if( NOT CMAKE_SYSTEM_NAME MATCHES "Darwin|Windows")
+    )
+ endif()
+ 
+-add_conan_lib(
+-   RapidJSON
+-   rapidjson/1.1.0
+-   REQUIRED
+-)
+if( ${_OPT}has_sentry_reporting )
+   add_conan_lib(
+      RapidJSON
+      rapidjson/1.1.0
+      REQUIRED
+   )
+endif()
+ 
+ set_conan_vars_to_parent()
+ 
+@@ -161,7 +163,7 @@ set_conan_vars_to_parent()
+ #       directory          option      symbol      req   chk   version
 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   "" )
--- a/audio/audacity/files/patch-cmake-proxies_cmake-modules_AudacityDependencies.cmake
+++ b/audio/audacity/files/patch-cmake-proxies_cmake-modules_AudacityDependencies.cmake
@ -0,0 +1,227 @@
+--- cmake-proxies/cmake-modules/AudacityDependencies.cmake.orig	2021-08-27 22:30:37 UTC
+++ cmake-proxies/cmake-modules/AudacityDependencies.cmake
+@@ -1,11 +1,14 @@
+ # Load Conan
+-include( conan )
+ 
+-conan_add_remote(NAME audacity
+-    URL https://artifactory.audacityteam.org/artifactory/api/conan/conan-local
+-    VERIFY_SSL True
+-)
+if( ${_OPT}conan_enabled )
+    include( conan )
+ 
+    conan_add_remote(NAME audacity
+        URL https://artifactory.audacityteam.org/artifactory/api/conan/conan-local
+        VERIFY_SSL True
+    )
+endif()
+
+ set( CONAN_BUILD_REQUIRES )
+ set( CONAN_REQUIRES )
+ set( CONAN_PACKAGE_OPTIONS )
+@@ -13,24 +16,30 @@ set( CONAN_ONLY_DEBUG_RELEASE )
+ set( CONAN_CONFIG_OPTIONS )
+ set( CONAN_RESOLVE_LIST )
+ 
+-# Add a Conan dependency
+-# Example usage:
+-# add_conan_lib( 
+-#   wxWdidget 
+-#   wxwidgets/3.1.3-audacity
+-#   OPTION_NAME wxwidgets
+-#   SYMBOL WXWIDGET
+-#   REQUIRED 
+-#   ALWAYS_ALLOW_CONAN_FALLBACK
+-#   PKG_CONFIG "wxwidgets >= 3.1.3"
+-#   FIND_PACKAGE_OPTIONS COMPONENTS adv base core html qa xml
+-#   INTERFACE_NAME wxwidgets::wxwidgets
+-#   HAS_ONLY_DEBUG_RELEASE
+-#   CONAN_OPTIONS 
+-#        wxwidgets:shared=True
+-# )
+#[[
+Add a Conan dependency
+ 
+Example usage:
+ 
+add_conan_lib( 
+  wxWdidget 
+  wxwidgets/3.1.3-audacity
+  OPTION_NAME wxwidgets
+  SYMBOL WXWIDGET
+  REQUIRED 
+  ALWAYS_ALLOW_CONAN_FALLBACK
+  PKG_CONFIG "wxwidgets >= 3.1.3"
+  FIND_PACKAGE_OPTIONS COMPONENTS adv base core html qa xml
+  INTERFACE_NAME wxwidgets::wxwidgets
+  HAS_ONLY_DEBUG_RELEASE
+  CONAN_OPTIONS 
+       wxwidgets:shared=True
+)
+
+PKG_CONFIG accepts a list of possible package configurations. 
+add_conan_lib will iterate over it one by one until the library is found.
+]]
+
+ function (add_conan_lib package conan_package_name )
+     # Extract the list of packages from the function args
+     list( SUBLIST ARGV 2 -1 options )
+@@ -54,6 +63,8 @@ function (add_conan_lib package conan_package_name )
+             set( list_mode on )
+             set( allow_find_package on )
+             set( current_var "find_package_options" )
+        elseif ( opt STREQUAL "ALLOW_FIND_PACKAGE" )
+            set ( allow_find_package on )
+         elseif ( opt STREQUAL "CONAN_OPTIONS" )
+             set( list_mode on )
+             set( current_var "conan_package_options" )
+@@ -93,14 +104,23 @@ function (add_conan_lib package conan_package_name )
+ 
+     set( option_desc "local" )
+ 
+-    if( pkg_config_options OR allow_find_package )
+    if( pkg_config_options OR allow_find_package OR NOT ${_OPT}conan_enabled )
+         set( sysopt "system" )
+         string( PREPEND option_desc "system (if available), " )
+-        set( default "${${_OPT}lib_preference}" )
+
+        if( ${_OPT}conan_enabled )
+            set( default "${${_OPT}lib_preference}" )
+        else()
+            set( default "system" )
+        endif()
+     else()
+         set( default "local" )
+     endif()
+ 
+    if( ${_OPT}conan_enabled )
+        set( localopt "local" )
+    endif()
+
+     if( NOT required )
+         set( reqopt "off" )
+         string( APPEND option_desc ", off" )
+@@ -109,7 +129,7 @@ function (add_conan_lib package conan_package_name )
+     cmd_option( ${option_name}
+                 "Use ${option_name_base} library [${option_desc}]"
+                 "${default}"
+-                STRINGS ${sysopt} "local" ${reqopt}
+                STRINGS ${sysopt} ${localopt} ${reqopt}
+     )
+     
+     # Early bail out
+@@ -129,26 +149,28 @@ function (add_conan_lib package conan_package_name )
+         return()
+     endif()
+ 
+-    if( ${option_name} STREQUAL "system" )
+    if( ${option_name} STREQUAL "system" OR NOT ${_OPT}conan_enabled )
+         if( pkg_config_options )
+-            pkg_check_modules( PKG_${package} ${pkg_config_options} )
+            foreach(variant ${pkg_config_options})
+                pkg_check_modules( PKG_${package} ${variant} )
+ 
+-            if( PKG_${package}_FOUND )
+-                message( STATUS "Using '${package}' system library" )
+-    
+-                # Create the target interface library
+-                add_library( ${interface_name} INTERFACE IMPORTED GLOBAL)
+                if( PKG_${package}_FOUND )
+                    message( STATUS "Using '${package}' system library" )
+         
+-                # Retrieve the package information
+-                get_package_interface( PKG_${package} )
+-        
+-                # And add it to our target
+-                target_include_directories( ${interface_name} INTERFACE ${INCLUDES} )
+-                target_link_libraries( ${interface_name} INTERFACE ${LIBRARIES} )
+                    # Create the target interface library
+                    add_library( ${interface_name} INTERFACE IMPORTED GLOBAL)
+            
+                    # Retrieve the package information
+                    get_package_interface( PKG_${package} )
+            
+                    # And add it to our target
+                    target_include_directories( ${interface_name} INTERFACE ${INCLUDES} )
+                    target_link_libraries( ${interface_name} INTERFACE ${LIBRARIES} )
+ 
+-                message(STATUS "Added inteface ${interface_name} ${INCLUDES} ${LIBRARIES}")
+-                return()
+-            endif()
+                    message(STATUS "Added inteface ${interface_name} ${INCLUDES} ${LIBRARIES}")
+                    return()
+                endif()
+            endforeach()
+         endif()
+ 
+         if( allow_find_package )
+@@ -160,7 +182,7 @@ function (add_conan_lib package conan_package_name )
+             endif()
+         endif()
+ 
+-        if( system_only )
+        if( system_only OR NOT ${_OPT}conan_enabled )
+             message( FATAL_ERROR "Failed to find the system package ${package}" )
+         else()
+             set( ${option_name} "local" )
+@@ -237,34 +259,36 @@ function ( _conan_install build_type )
+ endfunction()
+ 
+ macro( resolve_conan_dependencies )
+-    message(STATUS 
+-    "Executing Conan: \
+-        REQUIRES ${CONAN_REQUIRES}
+-        GENERATORS cmake_find_package_multi
+-        BUILD_REQUIRES ${CONAN_BUILD_REQUIRES}
+-        ${CONAN_CONFIG_OPTIONS}
+-        OPTIONS ${CONAN_PACKAGE_OPTIONS}
+-    ")
+    if( ${_OPT}conan_enabled )
+        message(STATUS 
+        "Executing Conan: \
+            REQUIRES ${CONAN_REQUIRES}
+            GENERATORS cmake_find_package_multi
+            BUILD_REQUIRES ${CONAN_BUILD_REQUIRES}
+            ${CONAN_CONFIG_OPTIONS}
+            OPTIONS ${CONAN_PACKAGE_OPTIONS}
+        ")
+ 
+-    if(MSVC OR XCODE)
+-        foreach(TYPE ${CMAKE_CONFIGURATION_TYPES})
+-            _conan_install(${TYPE})
+-        endforeach()
+-    else()
+-        _conan_install(${CMAKE_BUILD_TYPE})
+-    endif()
+        if(MSVC OR XCODE)
+            foreach(TYPE ${CMAKE_CONFIGURATION_TYPES})
+                _conan_install(${TYPE})
+            endforeach()
+        else()
+            _conan_install(${CMAKE_BUILD_TYPE})
+        endif()
+ 
+-    list( REMOVE_DUPLICATES CONAN_REQUIRES )
+        list( REMOVE_DUPLICATES CONAN_REQUIRES )
+ 
+-    foreach( package ${CONAN_RESOLVE_LIST} )
+-        message(STATUS "Resolving Conan library ${package}")
+        foreach( package ${CONAN_RESOLVE_LIST} )
+            message(STATUS "Resolving Conan library ${package}")
+ 
+-        find_package(${package} CONFIG)
+            find_package(${package} CONFIG)
+ 
+-        if (NOT ${package}_FOUND)
+-            message( FATAL_ERROR "Failed to find the conan package ${package}" )
+-        endif()
+-    endforeach()
+            if (NOT ${package}_FOUND)
+                message( FATAL_ERROR "Failed to find the conan package ${package}" )
+            endif()
+        endforeach()
+    endif()
+ 
+     file(GLOB dependency_helpers "${AUDACITY_MODULE_PATH}/dependencies/*.cmake")
+ 
--- a/audio/audacity/files/patch-cmake-proxies_cmake-modules_Findlibmp3lame.cmake
+++ b/audio/audacity/files/patch-cmake-proxies_cmake-modules_Findlibmp3lame.cmake
@ -0,0 +1,32 @@
+--- cmake-proxies/cmake-modules/Findlibmp3lame.cmake.orig	2021-08-27 22:30:58 UTC
+++ cmake-proxies/cmake-modules/Findlibmp3lame.cmake
+@@ -0,0 +1,29 @@
+#[[
+A module to look for libmp3lame
+]]
+
+if( NOT libmp3lame_FOUND )
+   find_path( libmp3lame_INCLUDE_DIR lame/lame.h )
+   find_library( libmp3lame_LIBRARIES NAMES mp3lame )
+
+   if( libmp3lame_INCLUDE_DIR AND libmp3lame_LIBRARIES )
+      set( libmp3lame_FOUND Yes )
+   endif()
+
+   if( libmp3lame_FOUND )
+      if( NOT libmp3lame_FIND_QUIETLY )
+         message( STATUS "Found lame: \n\tlibmp3lame_INCLUDE_DIR: ${libmp3lame_INCLUDE_DIR}\n\tlibmp3lame_LIBRARIES: ${libmp3lame_LIBRARIES}" )
+      endif()
+
+      if( NOT TARGET libmp3lame::libmp3lame )
+         add_library( libmp3lame::libmp3lame INTERFACE IMPORTED GLOBAL)
+
+         target_include_directories( libmp3lame::libmp3lame INTERFACE ${libmp3lame_INCLUDE_DIR} )
+         target_link_libraries( libmp3lame::libmp3lame INTERFACE ${libmp3lame_LIBRARIES} )
+      endif()
+   else()
+      if( libmp3lame_FIND_REQUIRED )
+         message( FATAL_ERROR "Could not find libmp3lame")
+      endif()
+   endif()
+endif()
--- a/audio/audacity/files/patch-cmake-proxies_cmake-modules_dependencies_wxwidgets.cmake
+++ b/audio/audacity/files/patch-cmake-proxies_cmake-modules_dependencies_wxwidgets.cmake
@ -0,0 +1,14 @@
+--- cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake.orig	2021-08-27 06:00:39 UTC
+++ cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake
+@@ -1,4 +1,10 @@
+-if( ${_OPT}use_wxwidgets STREQUAL "system" ) 
+if( ${_OPT}use_wxwidgets STREQUAL "system" OR NOT ${_OPT}conan_enabled )
+    # DV: find_package will be scoped, as FindwxWidgets.cmake is rather outdated.
+    # Still - let's perform the sanity check first.
+    if( NOT wxWidgets_FOUND )
+        find_package( wxWidgets REQUIRED COMPONENTS adv base core html qa xml net )
+    endif()
+
+     if( NOT TARGET wxwidgets::wxwidgets )
+         add_library( wxwidgets::wxwidgets INTERFACE IMPORTED GLOBAL)
+     endif()
--- a/audio/audacity/files/patch-cmake-proxies_wxWidgets_CMakeLists.txt
+++ b/audio/audacity/files/patch-cmake-proxies_wxWidgets_CMakeLists.txt
@ -1,20 +0,0 @@
--- cmake-proxies/wxWidgets/CMakeLists.txt.orig	2020-08-05 16:32:53 UTC
-+++ cmake-proxies/wxWidgets/CMakeLists.txt
-@@ -237,17 +237,6 @@ file(
-       "^#define +wxVERSION_STRING +"
- )
- 
-string( REGEX MATCHALL "\".+(Audacity).+\"" ours "${output}")
-if( NOT ours )
-   message( FATAL_ERROR
-      "\n########################################################################\n"
-      "Audacity version 3.0.0 or higher requires use of a customized version of "
-      "wxWidgets.  For details:\n"
-      "  https://wiki.audacityteam.org/wiki/Building_for_Distros\n"
-      "########################################################################\n"
-   )
-endif()
-
- target_include_directories( ${TARGET} INTERFACE ${INCLUDES} )
- target_compile_definitions( ${TARGET} INTERFACE ${DEFINES} )
- target_compile_options( ${TARGET} INTERFACE ${COPTS} )
--- a/audio/audacity/files/patch-src_AboutDialog.cpp
+++ b/audio/audacity/files/patch-src_AboutDialog.cpp
@ -1,11 +1,11 @@
--- src/AboutDialog.cpp.orig	2020-06-28 06:25:54 UTC
+--- src/AboutDialog.cpp.orig	2021-09-22 19:37:04 UTC
 +++ src/AboutDialog.cpp
-@@ -63,7 +63,7 @@ hold information about one contributor to Audacity.
+@@ -64,7 +64,7 @@ hold information about one contributor to Audacity.
 // RevisionIdent.h may contain #defines like these ones:
 //#define REV_LONG "28864acb238cb3ca71dda190a2d93242591dd80e"
 //#define REV_TIME "Sun Apr 12 12:40:22 2015 +0100"
-#include <RevisionIdent.h>
-+//#include <RevisionIdent.h>
+-#include "RevisionIdent.h"
+//#include "RevisionIdent.h"
 
 #ifndef REV_TIME
 #define REV_TIME "unknown date and time"
--- a/audio/audacity/files/patch-src_widgets_Grid.cpp
+++ b/audio/audacity/files/patch-src_widgets_Grid.cpp
@ -1,11 +0,0 @@
--- src/widgets/Grid.cpp.orig	2021-02-04 18:52:51 UTC
-+++ src/widgets/Grid.cpp
-@@ -572,7 +572,7 @@ void Grid::OnKeyDown(wxKeyEvent &event)
-          {
-             wxTextDataObject *data = safenew wxTextDataObject(GetCellValue(crow, ccol));
-             wxClipboard::Get()->SetData(data);
-            SetCellValue(crow, ccol, {});
-+            SetCellValue(crow, ccol, "");
-             return;
-          }
-          break;
--- a/audio/audacity/pkg-plist
+++ b/audio/audacity/pkg-plist
@ -1,9 +1,13 @@
+audacity
 bin/audacity
+lib/audacity/lib-string-utils.so
+lib/audacity/lib-strings.so
+lib/audacity/lib-utility.so
+lib/audacity/lib-uuid.so
+lib/audacity/modules/mod-script-pipe.so
 man/man1/audacity.1.gz
-share/appdata/audacity.appdata.xml
 share/applications/audacity.desktop
 %%DATADIR%%/EQDefaultCurves.xml
-%%DATADIR%%/modules/mod-script-pipe.so
 %%DATADIR%%/nyquist/aud-do-support.lsp
 %%DATADIR%%/nyquist/dspprims.lsp
 %%DATADIR%%/nyquist/envelopes.lsp
@ -141,6 +145,7 @@ share/icons/hicolor/scalable/apps/audacity.svg
 %%NLS%%share/locale/vi/LC_MESSAGES/audacity.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/audacity.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/audacity.mo
+share/metainfo/audacity.appdata.xml
 share/mime/packages/audacity.xml
 share/pixmaps/audacity.xpm
 share/pixmaps/audacity16.xpm
--- a/audio/codec2/Makefile
+++ b/audio/codec2/Makefile
@ -12,7 +12,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING

 LIB_DEPENDS=	libspeexdsp.so:audio/speexdsp

-CONFLICTS=	libcodec2-[0-9]*
+CONFLICTS=	libcodec2
 USES=		cmake pathfix pkgconfig shebangfix tar:xz
 USE_LDCONFIG=	yes

--- a/audio/flac/Makefile
+++ b/audio/flac/Makefile
@ -25,7 +25,6 @@ USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-static \
 		--disable-sse \
-		--disable-vsx \
 		--with-ogg="${LOCALBASE}" \
 		--disable-doxygen-docs \
 		--disable-thorough-tests \
@ -41,6 +40,10 @@ OPTIONS_DEFINE=	DOCS
 BUILD_DEPENDS+=	nasm:devel/nasm
 .endif

+.if ${ARCH} != powerpc64le
+CONFIGURE_ARGS+=--disable-vsx
+.endif
+
 post-install:
 	${REINPLACE_CMD} 's:%%PREFIX%%:${PREFIX}:' \
 	    ${STAGEDIR}${PREFIX}/man/man1/flac.1
--- a/audio/hpsjam/Makefile
+++ b/audio/hpsjam/Makefile
@ -2,8 +2,7 @@

 PORTNAME=	hpsjam
 DISTVERSIONPREFIX=	v
-DISTVERSION=		1.0.16
-PORTREVISION=	1
+DISTVERSION=		1.0.17
 CATEGORIES=	audio

 MAINTAINER=	hselasky@FreeBSD.org
--- a/audio/hpsjam/distinfo
+++ b/audio/hpsjam/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1627317574
-SHA256 (hselasky-hpsjam-v1.0.16_GH0.tar.gz) = 91652407032b646260e87bf58cb3d4d6b542d0e99356dd5fc539a893a73622c0
-SIZE (hselasky-hpsjam-v1.0.16_GH0.tar.gz) = 1230554
+TIMESTAMP = 1635603588
+SHA256 (hselasky-hpsjam-v1.0.17_GH0.tar.gz) = 855e7c293d5b17c1eb3c4618d613a4f1b091959402fcfa1361217a6767f3d5fe
+SIZE (hselasky-hpsjam-v1.0.17_GH0.tar.gz) = 1230549
--- a/audio/jamulus/Makefile
+++ b/audio/jamulus/Makefile
@ -1,7 +1,6 @@
 PORTNAME=	jamulus
 DISTVERSIONPREFIX=	r
-DISTVERSION=	3_8_0
-PORTREVISION=	2
+DISTVERSION=	3_8_1
 CATEGORIES=	audio

 MAINTAINER=	yuri@FreeBSD.org
--- a/audio/jamulus/distinfo
+++ b/audio/jamulus/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1622682373
-SHA256 (jamulussoftware-jamulus-r3_8_0_GH0.tar.gz) = eb3df34ab9e7c8443775bdff9867bd8e8415061eef1baeb2c55b777aedb2c1cd
-SIZE (jamulussoftware-jamulus-r3_8_0_GH0.tar.gz) = 3608539
+TIMESTAMP = 1635696960
+SHA256 (jamulussoftware-jamulus-r3_8_1_GH0.tar.gz) = bc20c6aa8d0d3dd6c98a54cc1759d611fe564a8c73f7da9b09b48d2a3dee1d25
+SIZE (jamulussoftware-jamulus-r3_8_1_GH0.tar.gz) = 3698896
--- a/audio/linux-c7-alsa-lib/Makefile
+++ b/audio/linux-c7-alsa-lib/Makefile
@ -16,7 +16,7 @@ USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes

-CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
+CONFLICTS=	linux-c6-${PORTNAME}

 OPTIONS_DEFINE=	DOCS

--- a/audio/linux-c7-alsa-plugins-oss/Makefile
+++ b/audio/linux-c7-alsa-plugins-oss/Makefile
@ -37,7 +37,7 @@ LIBDIR_i386=	/usr/lib
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 WRKSRC32=	${WRKDIR}/32/${PORTNAME}-${PORTVERSION}

-CONFLICTS=	linux-c6-${PORTNAME}${PKGNAMESUFFIX}-[0-9]*
+CONFLICTS=	linux-c6-${PORTNAME}${PKGNAMESUFFIX}
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 PLIST=		${PKGDIR}/pkg-plist.${ARCH}

--- a/audio/linux-c7-alsa-plugins-pulseaudio/Makefile
+++ b/audio/linux-c7-alsa-plugins-pulseaudio/Makefile
@ -19,7 +19,7 @@ USE_LINUX_RPM=	yes

 LIB_DISTNAMES=	${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}

-CONFLICTS=	linux-c6-${PORTNAME}${PKGNAMESUFFIX}-[0-9]*
+CONFLICTS=	linux-c6-${PORTNAME}${PKGNAMESUFFIX}
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 DOCSDIR=	${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}

--- a/audio/linux-c7-alsa-utils/Makefile
+++ b/audio/linux-c7-alsa-utils/Makefile
@ -14,7 +14,7 @@ USES=		linux:c7
 USE_LINUX=	alsalib alsa-plugins-oss
 USE_LINUX_RPM=	nolib

-CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
+CONFLICTS=	linux-c6-${PORTNAME}
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr

 OPTIONS_DEFINE=	DOCS NLS
--- a/audio/linux-c7-audiofile/Makefile
+++ b/audio/linux-c7-audiofile/Makefile
@ -13,7 +13,7 @@ USES=		cpe linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes

-CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
+CONFLICTS=	linux-c6-${PORTNAME}
 DESCR=		${.CURDIR}/../lib${PORTNAME}/pkg-descr

 OPTIONS_DEFINE=	DOCS
--- a/audio/linux-c7-flac/Makefile
+++ b/audio/linux-c7-flac/Makefile
@ -19,7 +19,7 @@ CPE_VENDOR=	flac_project

 LIB_DISTNAMES=	${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}

-CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
+CONFLICTS=	linux-c6-${PORTNAME}
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 DOCSDIR=	${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}

--- a/audio/linux-c7-libogg/Makefile
+++ b/audio/linux-c7-libogg/Makefile
@ -13,7 +13,7 @@ USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes

-CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
+CONFLICTS=	linux-c6-${PORTNAME}
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr

 OPTIONS_DEFINE=	DOCS
--- a/audio/linux-c7-libsndfile/Makefile
+++ b/audio/linux-c7-libsndfile/Makefile
@ -16,7 +16,7 @@ USE_LINUX_RPM=	yes

 CPE_VENDOR=	libsndfile_project

-CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
+CONFLICTS=	linux-c6-${PORTNAME}
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr

 OPTIONS_DEFINE=	DOCS
--- a/audio/linux-c7-libvorbis/Makefile
+++ b/audio/linux-c7-libvorbis/Makefile
@ -16,7 +16,7 @@ USE_LINUX_RPM=	yes

 CPE_VENDOR=	xiph.org

-CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
+CONFLICTS=	linux-c6-${PORTNAME}
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr

 OPTIONS_DEFINE=	DOCS
--- a/audio/linux-c7-openal-soft/Makefile
+++ b/audio/linux-c7-openal-soft/Makefile
@ -16,7 +16,7 @@ USE_LDCONFIG=	yes
 USE_LINUX=	alsalib
 USE_LINUX_RPM=	yes

-CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
+CONFLICTS=	linux-c6-${PORTNAME}
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr

 OPTIONS_DEFINE=	DOCS
--- a/audio/linux-c7-pulseaudio-libs/Makefile
+++ b/audio/linux-c7-pulseaudio-libs/Makefile
@ -19,7 +19,7 @@ USE_LINUX_RPM=	yes
 LIB_DISTNAMES=	${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL} \
 		${PORTNAME}${PKGNAMESUFFIX}-glib2-${DISTVERSIONFULL}

-CONFLICTS=	linux-c6-${PORTNAME}${PKGNAMESUFFIX}-[0-9]*
+CONFLICTS=	linux-c6-${PORTNAME}${PKGNAMESUFFIX}
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 DOCSDIR=	${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}

--- a/audio/linux-c7-pulseaudio-utils/Makefile
+++ b/audio/linux-c7-pulseaudio-utils/Makefile
@ -17,7 +17,7 @@ USE_LINUX_RPM=	nolib

 BIN_DISTNAMES=	${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}

-CONFLICTS=	linux-c6-${PORTNAME}${PKGNAMESUFFIX}-[0-9]*
+CONFLICTS=	linux-c6-${PORTNAME}${PKGNAMESUFFIX}
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr

 .include <bsd.port.mk>
--- a/audio/linux-c7-sdl_mixer/Makefile
+++ b/audio/linux-c7-sdl_mixer/Makefile
@ -18,7 +18,7 @@ USE_LDCONFIG=	yes
 USE_LINUX=	sdl12
 USE_LINUX_RPM=	yes

-CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
+CONFLICTS=	linux-c6-${PORTNAME}
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 DOCSDIR=	${PREFIX}/usr/share/doc/SDL_mixer-${PORTVERSION}

--- a/audio/mixxx/Makefile
+++ b/audio/mixxx/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	mixxx
 DISTVERSION=	2.3.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio

 MAINTAINER=	acm@FreeBSD.org
@ -47,7 +47,7 @@ USE_QT=		buildtools concurrent core dbus gui linguisttools_build network \
 CONFLICTS=	mixxx22*

 CMAKE_ARGS+=	-DINSTALL_USER_UDEV_RULES:BOOL=OFF \
-		-DOPTIMIZE:STRING=native \
+		-DOPTIMIZE:STRING=portable \
 		-DBATTERY:BOOL=OFF \
 		-DFAAD:BOOL=OFF \
 		-DMODPLUG:BOOL=ON \
--- a/audio/mixxx22/Makefile
+++ b/audio/mixxx22/Makefile
@ -3,7 +3,7 @@
 PORTNAME=	mixxx
 DISTVERSIONPREFIX=	release-
 DISTVERSION=	2.2.4
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	audio
 PKGNAMESUFFIX?=	22

@ -45,7 +45,7 @@ USE_QT=		buildtools concurrent core dbus gui network opengl script scripttools \
 CONFLICTS=	mixxx-*

 MAKE_ARGS=	qtdir="${PREFIX}" install_root="${PREFIX}" \
-		build=release optimize=native ${GUI} battery=0 vamp=1 modplug=1 mad=1
+		build=release optimize=portable ${GUI} battery=0 vamp=1 modplug=1 mad=1
 LATE_INSTALL_ARGS=	--install-sandbox=${STAGEDIR}

 GUI=		qt5=1
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@ -1,6 +1,5 @@
 PORTNAME=	musicpd
-PORTVERSION=	0.23.1
-PORTREVISION=	1
+PORTVERSION=	0.23.3
 CATEGORIES=	audio
 MASTER_SITES=	https://www.musicpd.org/download/mpd/${PORTVERSION:R}/
 DISTNAME=	mpd-${PORTVERSION}
--- a/audio/musicpd/distinfo
+++ b/audio/musicpd/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1634768410
-SHA256 (mpd-0.23.1.tar.xz) = 93990f026886cee3b8707b38cef575b1904f4a6e5fc6d92b2a82ba2a3a6302bd
-SIZE (mpd-0.23.1.tar.xz) = 764920
+TIMESTAMP = 1635759464
+SHA256 (mpd-0.23.3.tar.xz) = b300625701005c6b14649f11dac118d05540529a5385d05b7c3062c0ce08f399
+SIZE (mpd-0.23.3.tar.xz) = 767596
--- a/audio/openal-soft/Makefile
+++ b/audio/openal-soft/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	openal-soft
 PORTVERSION=	1.21.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	https://openal-soft.org/openal-releases/

--- a/audio/openal-soft/files/patch-alc_backends_sndio.cpp
+++ b/audio/openal-soft/files/patch-alc_backends_sndio.cpp
@ -251,26 +251,18 @@
 struct SndioCapture final : public BackendBase {
     SndioCapture(ALCdevice *device) noexcept : BackendBase{device} { }
     ~SndioCapture() override;
-@@ -301,6 +283,7 @@ struct SndioCapture final : public BackendBase {
- 
-     sio_hdl *mSndHandle{nullptr};
- 
-+    al::vector<struct pollfd> mFds;
-     RingBufferPtr mRing;
- 
-     std::atomic<bool> mKillNow{true};
-@@ -323,40 +306,65 @@ int SndioCapture::recordProc()
+@@ -323,40 +305,65 @@ int SndioCapture::recordProc()
 
     const uint frameSize{mDevice->frameSizeFromFmt()};
 
 +    int nfds_pre{sio_nfds(mSndHandle)};
-+    if (nfds_pre <= 0)
+    if(nfds_pre <= 0)
 +    {
 +        mDevice->handleDisconnect("Incorrect return value from sio_nfds(): %d", nfds_pre);
 +        return 1;
 +    }
 +
-+    mFds.resize(nfds_pre);
+    auto fds = std::make_unique<pollfd[]>(static_cast<uint>(nfds_pre));
 +
     while(!mKillNow.load(std::memory_order_acquire)
         && mDevice->Connected.load(std::memory_order_acquire))
@ -279,7 +271,7 @@
 -        size_t todo{data.first.len + data.second.len};
 -        if(todo == 0)
 +        /* Wait until there's some samples to read. */
-+        const int nfds{sio_pollfd(mSndHandle, mFds.data(), POLLIN)};
+        const int nfds{sio_pollfd(mSndHandle, fds.get(), POLLIN)};
 +        if(nfds <= 0)
         {
 -            static char junk[4096];
@ -288,7 +280,7 @@
 +            mDevice->handleDisconnect("Failed to get polling fds: %d", nfds);
 +            break;
 +        }
-+        int pollres{::poll(mFds.data(), static_cast<uint>(nfds), 2000)};
+        int pollres{::poll(fds.get(), static_cast<uint>(nfds), 2000)};
 +        if(pollres < 0)
 +        {
 +            if(errno == EINTR) continue;
@ -298,7 +290,7 @@
 +        if(pollres == 0)
             continue;
 +
-+        const int revents{sio_revents(mSndHandle, mFds.data())};
+        const int revents{sio_revents(mSndHandle, fds.get())};
 +        if((revents&POLLHUP))
 +        {
 +            mDevice->handleDisconnect("Got POLLHUP from poll events");
@ -347,7 +339,7 @@
     }
 
     return 0;
-@@ -371,76 +379,80 @@ void SndioCapture::open(const char *name)
+@@ -371,76 +378,80 @@ void SndioCapture::open(const char *name)
         throw al::backend_exception{al::backend_error::NoDevice, "Device name \"%s\" not found",
             name};
 
--- a/audio/osalp/Makefile
+++ b/audio/osalp/Makefile
@ -27,7 +27,7 @@ USE_LDCONFIG=	yes

 PLIST_SUB=	VERSION=${PORTVERSION}

-CONFLICTS=	libaudiofile-[0-9]*
+CONFLICTS=	libaudiofile

 post-patch:
 	@${FIND} ${WRKSRC} -name "*.cc" | ${XARGS} ${REINPLACE_CMD} -E \
--- a/audio/play/Makefile
+++ b/audio/play/Makefile
@ -9,7 +9,7 @@ MASTER_SITES=	PORTS_JP
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple audio file player

-CONFLICTS=	sox-[0-9]*
+CONFLICTS=	sox

 USES=		uidfix
 MAKE_ARGS=	CFLAGS="${CFLAGS}" MANDIR="${PREFIX}/man/ja/man" BINDIR="${PREFIX}/bin"
--- a/audio/sox/Makefile
+++ b/audio/sox/Makefile
@ -17,7 +17,7 @@ LICENSE_COMB=	dual

 LIB_DEPENDS=	libltdl.so:devel/libltdl

-CONFLICTS=	play-[0-9]*
+CONFLICTS=	play

 GNU_CONFIGURE=	yes
 USES=		autoreconf cpe libtool localbase:ldflags pkgconfig
--- a/audio/teamspeak3-server/Makefile
+++ b/audio/teamspeak3-server/Makefile
@ -29,7 +29,7 @@ SUB_FILES=	pkg-message
 USERS=	teamspeak
 GROUPS=	teamspeak

-CONFLICTS=	teamspeak_server-[0-9]*
+CONFLICTS=	teamspeak_server

 PLIST_SUB=	DBDIR=${DBDIR} \
 		ETCDIR=${ETCDIR} \
--- a/audio/waon/Makefile
+++ b/audio/waon/Makefile
@ -16,7 +16,7 @@ LIB_DEPENDS=	libfftw3.so:math/fftw3 \
 		libsndfile.so:audio/libsndfile \
 		libsamplerate.so:audio/libsamplerate

-CONFLICTS=	pv-[0-9]*
+CONFLICTS=	pv

 USES=		gnome ncurses pkgconfig
 USE_GNOME=	gtk20
--- a/benchmarks/phoronix-test-suite/Makefile
+++ b/benchmarks/phoronix-test-suite/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	phoronix-test-suite
 DISTVERSIONPREFIX=	v
-DISTVERSION=	10.4.0
+DISTVERSION=	10.6.1
 CATEGORIES=	benchmarks
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}

--- a/benchmarks/phoronix-test-suite/distinfo
+++ b/benchmarks/phoronix-test-suite/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1621700607
-SHA256 (phoronix-test-suite-phoronix-test-suite-v10.4.0_GH0.tar.gz) = 4feda834008c9844bbe675a6ce9b88a44d36965bc2d0a9d62c1407ba5b084935
-SIZE (phoronix-test-suite-phoronix-test-suite-v10.4.0_GH0.tar.gz) = 1762666
+TIMESTAMP = 1635761304
+SHA256 (phoronix-test-suite-phoronix-test-suite-v10.6.1_GH0.tar.gz) = 136d875a7ad9ec97b437638694fc25818b9262c90017c317d7a16c2255a9492f
+SIZE (phoronix-test-suite-phoronix-test-suite-v10.6.1_GH0.tar.gz) = 1764229
--- a/biology/biostar-tools/Makefile
+++ b/biology/biostar-tools/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	biostar-tools
-PORTVERSION=	1.9.0
+PORTVERSION=	1.9.1
 CATEGORIES=	biology python

 MAINTAINER=	jwb@FreeBSD.org
@ -62,7 +62,8 @@ RUN_DEPENDS=	wget>0:ftp/wget \
 		sam2pairwise>0:biology/sam2pairwise \
 		kallisto>0:biology/kallisto \
 		bamutil>0:biology/bamutil \
-		${PYTHON_PKGNAMEPREFIX}deepTools>0:biology/py-deeptools@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}deepTools>0:biology/py-deeptools@${PY_FLAVOR} \
+		igv>0:biology/igv

 USES=		metaport python

--- a/biology/biostar-tools/distinfo
+++ b/biology/biostar-tools/distinfo
@ -1 +1 @@
-TIMESTAMP = 1634212395
+TIMESTAMP = 1635607572
--- a/biology/emboss/Makefile
+++ b/biology/emboss/Makefile
@ -21,7 +21,7 @@ LIB_DEPENDS=	libgd.so:graphics/gd \
 USES=		gmake libtool iconv mysql pgsql ssl
 USE_SUBMAKE=	yes

-CONFLICTS=	qmail-ldap-[0-9]* digest-[0-9]*
+CONFLICTS=	qmail-ldap digest

 PREFIX?=	${LOCALBASE}/emboss
 NO_MTREE=	yes
--- a/biology/py-pysam/Makefile
+++ b/biology/py-pysam/Makefile
@ -10,7 +10,7 @@ COMMENT=	Python module for reading, manipulating and writing genomic data sets
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING

-USES=		gmake python:3.6+
+USES=		gmake python:3.6-3.9
 USE_PYTHON=	autoplist distutils cython cython_run

 .include <bsd.port.mk>
--- a/biology/seqan/Makefile
+++ b/biology/seqan/Makefile
@ -16,7 +16,7 @@ USES=		tar:xz
 NO_BUILD=	yes
 NO_ARCH=	yes

-CONFLICTS=	seqan1-[0-9]*
+CONFLICTS=	seqan1

 OPTIONS_DEFINE=	DOCS

--- a/cad/geda/Makefile
+++ b/cad/geda/Makefile
@ -41,9 +41,9 @@ DATADIR=	${PREFIX}/share/gEDA
 INFO=		geda-scheme
 BINARY_WRAPPERS=	gm4

-CONFLICTS=	geda-docs-[0-9]* geda-examples-[0-9]* geda-gattrib-[0-9]* \
-		geda-gschem-[0-9]* geda-netlist-[0-9]* geda-symbols-[0-9]* \
-		geda-symcheck-[0-9]* geda-utils-[0-9]* libgeda-[0-9]*
+CONFLICTS=	geda-docs geda-examples geda-gattrib \
+		geda-gschem geda-netlist geda-symbols \
+		geda-symcheck geda-utils libgeda

 PORTSCOUT=	limitw:1,even

--- a/cad/jspice3/Makefile
+++ b/cad/jspice3/Makefile
@ -13,7 +13,7 @@ BROKEN_riscv64=		fails to install: jspice3: No such file or directory
 BROKEN_FreeBSD_13=	fails to install: jspice3: No such file or directory
 BROKEN_FreeBSD_14=	fails to install: jspice3: No such file or directory

-CONFLICTS=	spice-[0-9]*
+CONFLICTS=	spice

 OPTIONS_DEFINE=	X11 EXAMPLES
 OPTIONS_DEFAULT=	X11
--- a/cad/netgen/Makefile
+++ b/cad/netgen/Makefile
@ -11,9 +11,6 @@ COMMENT=	Automatic 3D tetrahedral mesh generator
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE

-ONLY_FOR_ARCHS=		amd64 i386
-ONLY_FOR_ARCHS_REASON=	relies on rdtsc() call and the TSC is specific to x86
-
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
 		git:devel/git

--- a/cad/pcb/Makefile
+++ b/cad/pcb/Makefile
@ -27,7 +27,7 @@ USE_GL=		gl glu
 USE_GNOME=	intltool cairo pangox-compat
 USE_XORG=	x11 xrender xinerama

-CONFLICTS=	gts-[0-9]*
+CONFLICTS=	gts
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	INSTALL_DATA="${BSD_INSTALL_DATA}"
 LDFLAGS+=	-lpthread
--- a/chinese/fcitx-libpinyin/Makefile
+++ b/chinese/fcitx-libpinyin/Makefile
@ -26,7 +26,9 @@ USES=		cmake gettext gnome pkgconfig tar:xz
 _MODEL_VER=	20161206

 OPTIONS_DEFINE=	QT5
-OPTIONS_DEFAULT=QT5
+OPTIONS_DEFAULT_aarch64=	QT5
+OPTIONS_DEFAULT_amd64=	QT5
+OPTIONS_DEFAULT_i386=	QT5
 QT5_DESC=	Enable Qtr for dictmanager

 .include <bsd.port.options.mk>
--- a/chinese/opendesktop-fonts/Makefile
+++ b/chinese/opendesktop-fonts/Makefile
@ -9,7 +9,7 @@ MASTER_SITES?=	LOCAL/chinsan/fonts
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Ming and Kai face of OpenDesktop fonts

-CONFLICTS=	zh-fireflyttf-[0-9]*
+CONFLICTS=	zh-fireflyttf
 DIST_SUBDIR=	OpenFonts
 NO_BUILD=	yes
 NO_ARCH=	yes
--- a/chinese/phpbb-tw/Makefile
+++ b/chinese/phpbb-tw/Makefile
@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/docs/COPYING

 RUN_DEPENDS=	${LOCALBASE}/share/pear/System.php:devel/pear@${PHP_FLAVOR}

-CONFLICTS=	phpbb-[0-9]*
+CONFLICTS=	phpbb
 USES=		dos2unix php

 # Get HOSTNAME
--- a/comms/klog/Makefile
+++ b/comms/klog/Makefile
@ -1,21 +1,23 @@
 PORTNAME=	klog
-PORTVERSION=	0.9.8.1
-PORTREVISION=	1
+PORTVERSION=	1.8.5
+#PORTREVISION=	1
 CATEGORIES=	comms hamradio
-MASTER_SITES=	SAVANNAH

 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Simple Qt-based amateur radio logger

 LICENSE=	GPLv3
-LICENSE_FILE=	${WRKSRC}/COPYING
+#LICENSE_FILE=	${WRKSRC}/COPYING

 LIB_DEPENDS=	libhamlib.so:comms/hamlib

 USES=		compiler:c++11-lang gl qmake qt:5 xorg
+USE_GITHUB=	yes
 USE_GL=		gl
 USE_QT=		buildtools_build charts core gui linguisttools_build multimedia network \
 		printsupport sql sql-sqlite3_run serialport widgets
+GH_ACCOUNT=	ea4k
+GH_PROJECT=	klog

 DESKTOP_ENTRIES=	"KLog" "Simple Amateur Radio Logging Program" \
 		"" "klog" "Network;HamRadio;" \
@ -23,31 +25,28 @@ DESKTOP_ENTRIES=	"KLog" "Simple Amateur Radio Logging Program" \

 PLIST_FILES=	bin/klog \
 		${DATADIR}/translations/klog_ca.qm \
+		${DATADIR}/translations/klog_cs.qm \
+		${DATADIR}/translations/klog_da.qm \
 		${DATADIR}/translations/klog_de.qm \
 		${DATADIR}/translations/klog_es.qm \
-		${DATADIR}/translations/klog_fr.qm \
-		${DATADIR}/translations/klog_ja.qm \
-		${DATADIR}/translations/klog_da.qm \
 		${DATADIR}/translations/klog_fi.qm \
+		${DATADIR}/translations/klog_fr.qm \
 		${DATADIR}/translations/klog_hr.qm \
 		${DATADIR}/translations/klog_it.qm \
+		${DATADIR}/translations/klog_ja.qm \
 		${DATADIR}/translations/klog_pl.qm \
 		man/man1/klog.1.gz

 post-patch:
-	@${REINPLACE_CMD} '/"\/usr\/share\/klog\/translations\/klog_" + \
-		QLocale::system().name()/\
-		s|);|, "${DATADIR}/translations/");|' \
-			${WRKSRC}/main.cpp
-
-#post-build:
-#	${LRELEASE} ${WRKSRC}/${PORTNAME}.pro
+	@${REINPLACE_CMD} \
+	's|"\/usr\/share\/klog\/translations\/klog_"|"${DATADIR}/translations/klog_"|' \
+	${WRKSRC}/src/main.cpp

 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/build/target/klog ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/src/build/target/klog ${STAGEDIR}${PREFIX}/bin
 	${MKDIR} ${STAGEDIR}${DATADIR}/translations
-	${INSTALL_DATA} ${WRKSRC}/build/target/translations/klog_*.qm \
+	${INSTALL_DATA} ${WRKSRC}/src/build/target/translations/klog_*.qm \
 		${STAGEDIR}${DATADIR}/translations
-	${INSTALL_MAN} ${WRKSRC}/klog.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/src/klog.1 ${STAGEDIR}${MANPREFIX}/man/man1

 .include <bsd.port.mk>
--- a/comms/klog/distinfo
+++ b/comms/klog/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1567980395
-SHA256 (klog-0.9.8.1.tar.gz) = 068106b8e8a6aac2f62e7b5c9280a7aa97fe35bb11d37764039df2ab998ad36d
-SIZE (klog-0.9.8.1.tar.gz) = 2064170
+TIMESTAMP = 1635417161
+SHA256 (ea4k-klog-1.8.5_GH0.tar.gz) = 4b38dfb7d527871bdd36b3652cf92af214de1a69068816b6675deafe54e4cc71
+SIZE (ea4k-klog-1.8.5_GH0.tar.gz) = 3455827
--- a/comms/rtl-433/Makefile
+++ b/comms/rtl-433/Makefile
@ -5,7 +5,7 @@ PORTVERSION=	21.05
 PORTREVISION=	1
 CATEGORIES=	comms hamradio

-MAINTAINER=	rodrigo@FeeBSD.org
+MAINTAINER=	rodrigo@FreeBSD.org
 COMMENT=	Generic RF data receiver and decoder for ISM band devices

 LICENSE=	GPLv2
--- a/comms/smstools3/Makefile
+++ b/comms/smstools3/Makefile
@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE

 LIB_DEPENDS=	libinotify.so:devel/libinotify

-CONFLICTS=	gnokii-[0-9]* smstools-2.* sendsms-[0-9]*
+CONFLICTS=	gnokii smstools-2.* sendsms

 OPTIONS_DEFINE=	STATS UTF8 EXAMPLES DOCS
 OPTIONS_DEFAULT=	STATS UTF8
--- a/comms/uhd/Makefile
+++ b/comms/uhd/Makefile
@ -29,7 +29,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	EttusResearch
 GH_TAGNAME=	90ce6062b6b5df2eddeee723777be85108e4e7c7

-CONFLICTS=	usrp-[0-9]*
+CONFLICTS=	usrp

 BROKEN_FreeBSD_12_aarch64=	fails to configure: Could not find standard set_new_handler function
 BROKEN_FreeBSD_12_armv6=	fails to configure: Could not find standard set_new_handler function
--- a/databases/Makefile
+++ b/databases/Makefile
@ -32,6 +32,7 @@
    SUBDIR += cassandra3
    SUBDIR += cassandra4
    SUBDIR += casstcl
+    SUBDIR += caterva
    SUBDIR += cayley
    SUBDIR += cdb
    SUBDIR += cego
@ -228,7 +229,6 @@
    SUBDIR += mysqldump-secure
    SUBDIR += mysqlreport
    SUBDIR += mysqlsla
-    SUBDIR += mysqlsniffer
    SUBDIR += mysqltcl
    SUBDIR += mysqltuner
    SUBDIR += mysqlwsrep56-server
@ -757,6 +757,7 @@
    SUBDIR += py-bsddb3
    SUBDIR += py-carbon
    SUBDIR += py-cassandra-driver
+    SUBDIR += py-caterva
    SUBDIR += py-couchdb
    SUBDIR += py-dbf
    SUBDIR += py-dbutils
@ -970,7 +971,6 @@
    SUBDIR += rubygem-puppetdb_cli
    SUBDIR += rubygem-rbase
    SUBDIR += rubygem-redis
-    SUBDIR += rubygem-redis44
    SUBDIR += rubygem-redis-actionpack
    SUBDIR += rubygem-redis-actionpack-rails5
    SUBDIR += rubygem-redis-actionpack-rails50
@ -979,6 +979,7 @@
    SUBDIR += rubygem-redis-actionpack-rails61
    SUBDIR += rubygem-redis-namespace
    SUBDIR += rubygem-redis-namespace16
+    SUBDIR += rubygem-redis44
    SUBDIR += rubygem-sdbm
    SUBDIR += rubygem-seed-fu
    SUBDIR += rubygem-sqlite3
--- a/databases/akonadi/Makefile
+++ b/databases/akonadi/Makefile
@ -11,7 +11,7 @@ LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
 # Let process generate meaningful backtrace on core dump.
 BUILD_DEPENDS=	xsltproc:textproc/libxslt

-CONFLICTS=	akonadi-[0-9]* akonadi-kf5-git-[0-9]*
+CONFLICTS=	akonadi akonadi-kf5-git

 USES=		cmake compiler:c++11-lib gettext gnome kde:5 qt:5 \
 		shared-mime-info tar:xz
--- a/databases/caterva/Makefile
+++ b/databases/caterva/Makefile
@ -0,0 +1,30 @@
+# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
+
+PORTNAME=	caterva
+PORTVERSION=	0.5.0
+DISTVERSIONPREFIX=	v
+CATEGORIES=	databases
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Multidimensional data container on top of Blosc2
+
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+LIB_DEPENDS=	libblosc2.so:archivers/c-blosc2
+
+USES=		cmake pkgconfig
+
+CMAKE_OFF=	CATERVA_ENABLE_ASAN CATERVA_ENABLE_COVERAGE
+CMAKE_ON=	CATERVA_BUILD_BENCH CATERVA_BUILD_EXAMPLES CATERVA_BUILD_TESTS CATERVA_PREFER_BLOSC2_EXTERNAL CATERVA_SHARED_LIB CATERVA_STATIC_LIB
+USE_LDCONFIG=	yes
+
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
+
+GH_ACCOUNT=	Blosc
+USE_GITHUB=	yes
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|%%PORTVERSION%%|${PORTVERSION}|' ${WRKSRC}/CMakeLists.txt
+
+.include <bsd.port.mk>
--- a/databases/caterva/distinfo
+++ b/databases/caterva/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1635730867
+SHA256 (Blosc-caterva-v0.5.0_GH0.tar.gz) = 733449b36e5e3ba8d87e254daae8bde9a3122510da75416743cbfed3003d9d38
+SIZE (Blosc-caterva-v0.5.0_GH0.tar.gz) = 528006
--- a/databases/caterva/files/patch-CMakeLists.txt
+++ b/databases/caterva/files/patch-CMakeLists.txt
@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig	2021-07-13 10:42:01 UTC
+++ CMakeLists.txt
+@@ -104,6 +104,8 @@ if(CATERVA_SHARED_LIB)
+         target_link_libraries(caterva_shared ${LIBS})
+     endif()
+     set_target_properties(caterva_shared PROPERTIES OUTPUT_NAME caterva)
+    set_target_properties(caterva_shared PROPERTIES SOVERSION %%PORTVERSION%%)
+    set_target_properties(caterva_shared PROPERTIES VERSION 0)
+     install(TARGETS caterva_shared DESTINATION lib)
+ endif()
+ 
--- a/databases/caterva/pkg-descr
+++ b/databases/caterva/pkg-descr
@ -0,0 +1,10 @@
+Caterva is a C library for handling multi-dimensional, compressed datasets in an
+easy and convenient manner. It implements a thin metalayer on top of C-Blosc2
+for specifying not only the dimensionality of a dataset, but also the
+dimensionality of the chunks inside the dataset. In addition, Caterva adds
+machinery for retrieving arbitrary multi-dimensional slices (aka hyper-slices)
+out of the multi-dimensional containers in the most efficient way. Hence,
+Caterva brings the convenience of multi-dimensional and compressed containers to
+your application very easily.
+
+WWW: https://github.com/Blosc/caterva
--- a/databases/caterva/pkg-plist
+++ b/databases/caterva/pkg-plist
@ -0,0 +1,5 @@
+include/caterva.h
+lib/libcaterva.a
+lib/libcaterva.so
+lib/libcaterva.so.0
+lib/libcaterva.so.%%PORTVERSION%%
--- a/databases/go-pgweb/Makefile
+++ b/databases/go-pgweb/Makefile
@ -1,10 +1,11 @@
 PORTNAME=	pgweb
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.11.7
+PORTREVISION=	1
 CATEGORIES=	databases www
 PKGNAMEPREFIX=	go-

-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	daniel@morante.net
 COMMENT=	Web-based database browser for PostgreSQL

 LICENSE=	MIT
@ -12,7 +13,18 @@ LICENSE=	MIT
 USES=		go
 USE_GITHUB=	yes
 GH_ACCOUNT=	sosedoff
+USE_RC_SUBR=	${PORTNAME}
+
 GO_PKGNAME=	github.com/sosedoff/pgweb
+
+SUB_FILES+=	pkg-message
+SUB_LIST+=	PGWEBGROUP=${GROUPS} \
+		PGWEBUSER=${USERS} \
+		PORTNAME=${PORTNAME}
+
 PLIST_FILES=	bin/pgweb

+USERS=		www
+GROUPS=		www
+
 .include <bsd.port.mk>
--- a/databases/go-pgweb/files/pgweb.in
+++ b/databases/go-pgweb/files/pgweb.in
@ -0,0 +1,50 @@
+#!/bin/sh
+#
+#
+# PROVIDE: %%PORTNAME%%
+# REQUIRE: NETWORKING
+# KEYWORD:
+#
+# Add the following lines to /etc/rc.conf to enable %%PORTNAME%%:
+# %%PORTNAME%%_enable="YES"
+#
+# %%PORTNAME%%_enable (bool):		Set to YES to enable %%PORTNAME%%
+#					Default: NO
+# %%PORTNAME%%_bind (str):		HTTP server host
+#					Default: localhost
+# %%PORTNAME%%_listen (str):	HTTP server listen port
+#					Default: 8081
+# %%PORTNAME%%_user (str):		%%PORTNAME%% daemon user
+#					Default: %%PGWEBUSER%%
+# %%PORTNAME%%_group (str):		%%PORTNAME%% daemon group
+#					Default: %%PGWEBGROUP%%
+
+. /etc/rc.subr
+
+name="%%PORTNAME%%"
+rcvar="%%PORTNAME%%_enable"
+load_rc_config $name
+
+: ${%%PORTNAME%%_user:="www"}
+: ${%%PORTNAME%%_group:="www"}
+: ${%%PORTNAME%%_enable:="NO"}
+: ${%%PORTNAME%%_bind:="localhost"}
+: ${%%PORTNAME%%_flags=""}
+: ${%%PORTNAME%%_facility:="daemon"}
+: ${%%PORTNAME%%_priority:="debug"}
+: ${%%PORTNAME%%_listen:="8081"}
+
+procname="%%PREFIX%%/bin/${name}"
+pidfile="/var/run/${name}.pid"
+start_precmd="${name}_precmd"
+command=/usr/sbin/daemon
+command_args="-S -l ${%%PORTNAME%%_facility} -s ${%%PORTNAME%%_priority} -T ${name} -t ${name} -p ${pidfile} \
+	${procname} --bind=${%%PORTNAME%%_bind} --listen=${%%PORTNAME%%_listen} ${%%PORTNAME%%_flags}"
+
+%%PORTNAME%%_precmd()
+{
+	install -o ${%%PORTNAME%%_user} /dev/null ${pidfile}
+}
+
+run_rc_command "$1"
+
--- a/databases/go-pgweb/files/pkg-message.in
+++ b/databases/go-pgweb/files/pkg-message.in
@ -0,0 +1,22 @@
+[
+{ type: install
+  message: <<EOM
+
+To run Pgweb at startup, enable it in your /etc/rc.conf:
+sysrc pgweb_enable="YES"
+
+To start Pgweb:
+service pgweb start
+
+Pgweb will listen on port 8081 and bind to localhost.  
+This can be changed by setting "pgweb_bind" and "pgweb_listen" 
+in /etc/rc.conf.
+
+sysrc pgweb_bind="0.0.0.0" pgweb_listen="80"
+
+Additional options can be set using "pgweb_flags". See 'pgweb --help' for a list
+of all options.
+
+EOM
+}
+]
--- a/databases/libdrizzle-redux/Makefile
+++ b/databases/libdrizzle-redux/Makefile
@ -18,7 +18,7 @@ GNU_CONFIGURE=	yes
 USES=		gmake libtool ssl
 USE_LDCONFIG=	yes

-CONFLICTS=	libdrizzle-[0-9]*
+CONFLICTS=	libdrizzle

 OPTIONS_DEFINE=	DOCS

--- a/databases/linux-c7-sqlite3/Makefile
+++ b/databases/linux-c7-sqlite3/Makefile
@ -15,7 +15,7 @@ USES=		cpe linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes

-CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
+CONFLICTS=	linux-c6-${PORTNAME}
 DESCR=		${.CURDIR}/../${PORTNAME}3/pkg-descr

 OPTIONS_DEFINE=	DOCS
--- a/databases/mongodb-tools/Makefile
+++ b/databases/mongodb-tools/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	mongodb-tools
-DISTVERSION=	100.5.0
+DISTVERSION=	100.5.1
 CATEGORIES=	databases

 MAINTAINER=	ronald-lists@klop.ws
--- a/databases/mongodb-tools/distinfo
+++ b/databases/mongodb-tools/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1630829617
-SHA256 (mongodb-mongo-tools-100.5.0_GH0.tar.gz) = b2004cc1fc417125ecbd90e44576188a3402e81fe0b62c7e3ecd8b6748025b90
-SIZE (mongodb-mongo-tools-100.5.0_GH0.tar.gz) = 3796035
+TIMESTAMP = 1634148867
+SHA256 (mongodb-mongo-tools-100.5.1_GH0.tar.gz) = 04441784c364caf6d2603307c93c21c3b55808d0a3efae00bd34b4edf37e492d
+SIZE (mongodb-mongo-tools-100.5.1_GH0.tar.gz) = 3796549
--- a/databases/mongodb44/Makefile
+++ b/databases/mongodb44/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	mongodb
 DISTVERSIONPREFIX=	r
-DISTVERSION=	4.4.9
+DISTVERSION=	4.4.10
 CATEGORIES=	databases net
 MASTER_SITES=	https://fastdl.mongodb.org/src/ \
 		http://fastdl.mongodb.org/src/
@ -63,11 +63,6 @@ SSL_MAKE_ARGS=	--ssl

 .include <bsd.port.pre.mk>

-.if ${OPSYS} == FreeBSD && ((${OSREL:R} >= 14 && ${OSVERSION} < 1400033) \
-                        && ${ARCH} == "aarch64")
-BROKEN=        Aarch64 needs LSE atomics which was fixed in https://cgit.freebsd.org/src/commit/?id=efe67f33c322265eb303ec0ab40275100795b22a
-.endif
-
 .if ${ARCH} == aarch64 || ${ARCH} == powerpc64le
 EXTRA_PATCHES=	${FILESDIR}/${ARCH}
 .endif
--- a/databases/mongodb44/distinfo
+++ b/databases/mongodb44/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1632143635
-SHA256 (mongodb-src-r4.4.9.tar.gz) = 4eee0a2213b4c455d5bc21c78a5a6a02bf33ac09e6c6bba8d5547247307a319f
-SIZE (mongodb-src-r4.4.9.tar.gz) = 50541749
+TIMESTAMP = 1634213164
+SHA256 (mongodb-src-r4.4.10.tar.gz) = dd22cafd4a0ee8bce3a2d0a776e092b8f0ff193beba7d1718f6b8ac5f9e0c9e6
+SIZE (mongodb-src-r4.4.10.tar.gz) = 50636024
--- a/databases/mydumper/Makefile
+++ b/databases/mydumper/Makefile
@ -1,7 +1,7 @@
 # Created by: Gea-Suan Lin <gslin@gslin.org>

 PORTNAME=	mydumper
-DISTVERSION=	0.11.1-3
+DISTVERSION=	0.11.1-4
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases

--- a/databases/mydumper/distinfo
+++ b/databases/mydumper/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1632664292
-SHA256 (maxbube-mydumper-v0.11.1-3_GH0.tar.gz) = ec5da4b19522f7b78bf546a9f726166d21f64c3f3e534f55a94313ca1208d770
-SIZE (maxbube-mydumper-v0.11.1-3_GH0.tar.gz) = 77589
+TIMESTAMP = 1635730881
+SHA256 (maxbube-mydumper-v0.11.1-4_GH0.tar.gz) = 44cee8152a5aab172aaac14f32ac5d981c9db1de2f07c8f87502e6aab1efd792
+SIZE (maxbube-mydumper-v0.11.1-4_GH0.tar.gz) = 77679
--- a/Show more
+++ b/Show more