Merge branch 'freebsd/main' into hardenedbsd/main

* freebsd/main: (22 commits)
  www/py-django30: Mark as DEPRECATED
  sysutils/ansible-{kld,sysrc}: Update to latest commit and convert to slave ports
  games/iqpuzzle: Update 1.2.2 -> 1.2.3
  devel/py-pybind11: Update 2.6.1 -> 2.6.2
  www/authelia: Update 4.28.0 -> 4.28.1
  graphics/avir: Update 2.7 -> 2.8
  sysutils/jail_exporter: fix build on ARM / POWER
  Unbreak nVidia driver build against new feature branch 465.xx, which now includes Vulkan driver for FreeBSD.
  net/py-cloudscraper: update to 1.2.58
  www/oneshot: Update to 1.5.0
  audio/zynaddsubfx: Build fix for installing bash completions.
  textproc/dasel: Update to 1.14.1
  graphics/yed: Update 3.20.1 -> 3.21.1
  x11-toolkits/wxgtk31: Update 3.1.4 -> 3.1.5
  Erlang: bump PORTREVISION after 24e45b05.
  - Add couple of fallback master sites for `x11-themes/thewidgetfactory' - Assume maintainership and remove useless WWW line from the pkg-descr
  Update nVidia driver, Linux libraries, and tools to version 460.73.01, which had added support for the following GPUs:
  devel/mill Update to 0.9.6
  audio/snd: Update to 21.2
  dns/dnsrecon: Update to 0.10.1
  ...

astro/opencpn/Makefile

 PORTNAME=	opencpn
 PORTVERSION=	5.2.4
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	astro geography
 

audio/audacity/Makefile

@@ -2,7 +2,7 @@
 
 PORTNAME=	audacity
 PORTVERSION=	2.4.2
-PORTREVISION=	3
+PORTREVISION=	4
 DISTVERSIONPREFIX=	Audacity-
 CATEGORIES=	audio
 

audio/snd/Makefile

 # Created by: trevor
 
 PORTNAME=	snd
-PORTVERSION=	15.7
-PORTREVISION=	4
+PORTVERSION=	21.2
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ccrma-ftp.stanford.edu/pub/Lisp/ \
+MASTER_SITES=	https://ccrma.stanford.edu/software/snd/ \
 		SF
 
 MAINTAINER=	portmaster@bsdforge.com
@@ -15,13 +14,14 @@ LICENSE_NAME=	snd license
 LICENSE_FILE=	${WRKSRC}/COPYING
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
+USES=		localbase:ldflags
+
 OPTIONS_DEFINE=	FFTW3 GSL S7 LADSPA MOTIF GTK2 X11 DOCS EXAMPLES
 OPTIONS_DEFAULT=	FFTW3 GSL LADSPA GTK2 X11
 FFTW3_DESC=	Use FFTW
 GSL_DESC=	Use GNU Scientific Library
 S7_DESC=	Use S7 as the extension language
 
-USES=		localbase:ldflags
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-float-samples
 MAKEFILE=	makefile

audio/snd/distinfo

-SHA256 (snd-15.7.tar.gz) = 8c4199df55809582f6ab2885de883f8b98f39192d0999692433a9842a9a9cc88
-SIZE (snd-15.7.tar.gz) = 14684857
+TIMESTAMP = 1617629350
+SHA256 (snd-21.2.tar.gz) = bd0a1ab48eaf89b4c4cfb4af86f1ce2d696ebce4ccc307752a729b77d1c08100
+SIZE (snd-21.2.tar.gz) = 14568859

audio/snd/pkg-plist

@@ -8,19 +8,17 @@ man/man1/snd.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/fm.html
 %%PORTDOCS%%%%DOCSDIR%%/grfsnd.html
 %%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/s7.html
-%%PORTDOCS%%%%DOCSDIR%%/pix/8.png
-%%PORTDOCS%%%%DOCSDIR%%/pix/8way.png
-%%PORTDOCS%%%%DOCSDIR%%/pix/88.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/100twice.png
-%%PORTDOCS%%%%DOCSDIR%%/pix/all57.png
-%%PORTDOCS%%%%DOCSDIR%%/pix/all99.png
-%%PORTDOCS%%%%DOCSDIR%%/pix/odd57.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/1f.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/2pole.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/4grfs.png
+%%PORTDOCS%%%%DOCSDIR%%/pix/8.png
+%%PORTDOCS%%%%DOCSDIR%%/pix/88.png
+%%PORTDOCS%%%%DOCSDIR%%/pix/8way.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/addamps.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/adjustable.png
+%%PORTDOCS%%%%DOCSDIR%%/pix/all57.png
+%%PORTDOCS%%%%DOCSDIR%%/pix/all99.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/am.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/ampenv1.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/ampenv2.png
@@ -174,11 +172,10 @@ man/man1/snd.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/pix/mixer.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/mixname.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/multifm.png
+%%PORTDOCS%%%%DOCSDIR%%/pix/n.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/n3a1.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/n3a2.png
-%%PORTDOCS%%%%DOCSDIR%%/pix/n.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/n5-all.png
-%%PORTDOCS%%%%DOCSDIR%%/pix/noidchoices.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/ncosfm.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/ncossweep.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/nkcos.png
@@ -186,15 +183,16 @@ man/man1/snd.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/pix/noid3.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/noid4.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/noid5.png
-%%PORTDOCS%%%%DOCSDIR%%/pix/note.png
+%%PORTDOCS%%%%DOCSDIR%%/pix/noidchoices.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/nowgl.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/nrxy-r.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/nsinfm.png
+%%PORTDOCS%%%%DOCSDIR%%/pix/odd57.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/open-dialog.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/orig-oboe.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/pad1.png
-%%PORTDOCS%%%%DOCSDIR%%/pix/phase-paths.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/peak-path.png
+%%PORTDOCS%%%%DOCSDIR%%/pix/phase-paths.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/polyfm.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/polyshape.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/poussin.png
@@ -222,8 +220,8 @@ man/man1/snd.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/pix/rmspk.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/roundinterp.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/rr2.png
-%%PORTDOCS%%%%DOCSDIR%%/pix/s64pi.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/s.png
+%%PORTDOCS%%%%DOCSDIR%%/pix/s64pi.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/s65536.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/samplesviacolormap.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/saveas.png
@@ -314,6 +312,7 @@ man/man1/snd.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/pix/wt.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/xex.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/zramp.png
+%%PORTDOCS%%%%DOCSDIR%%/s7.html
 %%PORTDOCS%%%%DOCSDIR%%/snd.html
 %%PORTDOCS%%%%DOCSDIR%%/sndclm.html
 %%PORTDOCS%%%%DOCSDIR%%/sndlib.html

audio/zynaddsubfx/Makefile

@@ -3,7 +3,7 @@
 PORTNAME=	zynaddsubfx
 DISTVERSION=	3.0.6-rc3
 PORTEPOCH=	1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 
 MAINTAINER=	hselasky@FreeBSD.org
@@ -24,7 +24,7 @@ GH_TUPLE=	DISTRHO:DPF:e0d8e14a14d407648768da7e34bcf31812245387:d/DPF \
 		fundamental:rtosc:7de244bae04deb5964516ba544e551d95e7f15ce:e/rtosc \
 		zynaddsubfx:instruments:39e17e1c5c3db56fe9d0308af28be90f172e455e:f/instruments
 
-OPTIONS_DEFINE=		OSS JACK GUI PORTAUDIO SNDIO LASH DOCS EXAMPLES
+OPTIONS_DEFINE=		BASH OSS JACK GUI PORTAUDIO SNDIO LASH DOCS EXAMPLES
 OPTIONS_DEFAULT=	OSS JACK GUI PORTAUDIO
 OPTIONS_RADIO=		AUDIO
 OPTIONS_RADIO_AUDIO=	ALSAMIDI DSSI
@@ -36,6 +36,9 @@ DSSI_DESC=	DSSI Plugin
 ALSAMIDI_LIB_DEPENDS=		libasound.so:audio/alsa-lib
 ALSAMIDI_CMAKE_OFF=		-DAlsaEnable:BOOL=OFF
 
+BASH_DESC=			Support for bash auto-completion
+BASH_BUILD_DEPENDS=		bash-completion>=0:shells/bash-completion
+
 DSSI_LIB_DEPENDS=		libdssialsacompat.so:audio/libdssialsacompat
 DSSI_BUILD_DEPENDS=		dssi>0:audio/dssi
 DSSI_RUN_DEPENDS=		dssi>0:audio/dssi

audio/zynaddsubfx/pkg-plist

@@ -79,7 +79,7 @@ lib/vst/ZynReverb.so
 %%GUI%%share/applications/zynaddsubfx-jack-multi.desktop
 %%GUI%%share/applications/zynaddsubfx-alsa.desktop
 %%GUI%%share/applications/zynaddsubfx-oss.desktop
-share/bash-completion/completions/zynaddsubfx
+%%BASH%%share/bash-completion/completions/zynaddsubfx
 share/pixmaps/zynaddsubfx.svg
 share/pixmaps/zynaddsubfx.png
 %%DATADIR%%/banks/Arpeggios/0001-Arpeggio1.xiz

cad/PrusaSlicer/Makefile

 PORTNAME=	PrusaSlicer
 DISTVERSIONPREFIX=version_
 DISTVERSION=	2.3.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	cad
 
 MAINTAINER=	teodorsigaev@gmail.com

cad/basicdsp/Makefile

@@ -2,7 +2,7 @@
 
 PORTNAME=	basicdsp
 PORTVERSION=	1.01
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	cad education hamradio
 MASTER_SITES=	http://wwwhome.cs.utwente.nl/~ptdeboer/ham/basicdsp/ \
 		LOCAL/db

comms/cubicsdr/Makefile

 PORTNAME=	cubicsdr
 DISTVERSION=	0.2.5
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	comms hamradio
 
 MAINTAINER=	hamradio@FreeBSD.org

comms/cwstudio/Makefile

 PORTNAME=	cwstudio
 DISTVERSION=	0.9.6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SOURCEFORGE/cwstudio
 

comms/freedv/Makefile

 PORTNAME=	freedv
 DISTVERSION=	1.3.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	comms hamradio
 MASTER_SITES=	https://hobbes1069.fedorapeople.org/freetel/freedv/
 

comms/limesuite/Makefile

 PORTNAME=	limesuite
 DISTVERSIONPREFIX=	v
 DISTVERSION=	20.10.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	comms astro hamradio
 
 MAINTAINER=	tomek@cedro.info

comms/trustedqsl/Makefile

 PORTNAME=	trustedqsl
 DISTVERSION=	2.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.arrl.org/files/file/LoTW%20Instructions/ \
 		LOCAL/shurd

converters/pdf2djvu/Makefile

 PORTNAME=	pdf2djvu
 DISTVERSION=	0.9.17.1
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	converters
 MASTER_SITES=	https://github.com/jwilk/${PORTNAME}/releases/download/${PORTVERSION}/
 

databases/kbibtex/Makefile

@@ -2,7 +2,7 @@
 
 PORTNAME=	kbibtex
 DISTVERSION=	0.9.2
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	databases kde
 MASTER_SITES=	KDE/stable/KBibTeX/${DISTVERSION}
 

databases/pgadmin3/Makefile

@@ -2,7 +2,7 @@
 
 PORTNAME=	pgadmin3
 PORTVERSION=	1.22.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	databases
 MASTER_SITES=	PGSQL/pgadmin/pgadmin3/v${PORTVERSION}/src
 DIST_SUBDIR=	postgresql

deskutils/calibre/Makefile

@@ -2,7 +2,7 @@
 
 PORTNAME=	calibre
 PORTVERSION=	5.14.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils python
 MASTER_SITES=	http://download.calibre-ebook.com/${PORTVERSION}/
 

deskutils/cfiles/Makefile

@@ -2,7 +2,7 @@ PORTNAME=	cfiles
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.8-6
 DISTVERSIONSUFFIX=	-g327d47f
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	deskutils
 
 MAINTAINER=	yuri@FreeBSD.org

deskutils/lumina-pdf/Makefile

 PORTNAME=	lumina-pdf
 DISTVERSION=	1.6.0
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	deskutils
 
 MAINTAINER=	lbartoletti@FreeBSD.org