diff --git a/databases/py-pymysql/Makefile b/databases/py-pymysql/Makefile
index f0fc20386480..1cc259e9d149 100644
--- a/databases/py-pymysql/Makefile
+++ b/databases/py-pymysql/Makefile
@@ -1,29 +1,30 @@
 PORTNAME=	pymysql
 DISTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	databases python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	Pure Python MySQL Driver
 WWW=		https://github.com/PyMySQL/PyMySQL
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist pep517
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	ED25519 RSA
 
 ED25519_DESC=	MariaDB ed25519 auth method support
-ED25519_LIB_DEPENDS_ON=	${PYTHON_PKGNAMEPREFIX}pynacl>=1.4.0:security/py-pynacl@${PY_FLAVOR}
+ED25519_LIB_DEPENDS_ON=	${PYTHON_PKGNAMEPREFIX}PyNaCl>=1.4.0:security/py-pynacl@${PY_FLAVOR}
 
 RSA_DESC=	sha256_password or caching_sha2_password auth method support
 RSA_LIB_DEPENDS_ON=${PYTHON_PKGNAMEPREFIX}pycryptography:security/py-cryptography@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/devel/py-PyGithub/Makefile b/devel/py-PyGithub/Makefile
index 9403915af59b..14615a016723 100644
--- a/devel/py-PyGithub/Makefile
+++ b/devel/py-PyGithub/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	PyGithub
 DISTVERSION=	2.8.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel www python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME:tl}-${PORTVERSION}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Python library implementing the full GitHub API v3
 WWW=		https://github.com/jacquev6/PyGithub
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING.LESSER
 
 BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=2.14.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyjwt>=2.4.0:www/py-pyjwt@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pynacl>=1.4.0:security/py-pynacl@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}PyNaCl>=1.4.0:security/py-pynacl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.5.0:devel/py-typing-extensions@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}urllib3>-1.26.0:net/py-urllib3@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|64|63|' ${WRKSRC}/pyproject.toml
 
 .include <bsd.port.mk>
diff --git a/mail/py-dkimpy-milter/Makefile b/mail/py-dkimpy-milter/Makefile
index 6e7039a9fb14..e9f97c532f1f 100644
--- a/mail/py-dkimpy-milter/Makefile
+++ b/mail/py-dkimpy-milter/Makefile
@@ -1,44 +1,44 @@
 PORTNAME=	dkimpy-milter
 PORTVERSION=	1.2.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=  ${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	matthew@FreeBSD.org
 COMMENT=	DKIM signing and verification milter
 WWW=		https://launchpad.net/dkimpy-milter
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PY_SETUPTOOLS}
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dkimpy>=1.1.0:mail/py-dkimpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pymilter>=1.0.5:mail/py-pymilter@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}authres>=1.1.0:mail/py-authres@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pynacl>=0:security/py-pynacl@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}PyNaCl>=0:security/py-pynacl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dnspython>=1.16.0:dns/py-dnspython@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 USE_RC_SUBR=	dkimpy-milter
 SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}
 
 USERS=		dkimpy-milter
 GROUPS=		dkimpy-milter
 
 PYDISTUTILS_CONFIGUREARGS=	expand --rundir=/var/run
 
 NO_ARCH=	yes
 
 PLIST_FILES=	'@dir(${USERS},${GROUPS},755) /var/run/dkimpy-milter' \
 		'@sample etc/dkimpy-milter/dkimpy-milter.conf.sample'
 
 post-install:
 	@${MKDIR} ${STAGEDIR}/var/run/dkimpy-milter \
 	      ${STAGEDIR}${PREFIX}/etc/dkimpy-milter
 	${INSTALL_DATA} ${WRKSRC}/etc/dkimpy-milter.conf \
 	      ${STAGEDIR}${PREFIX}/etc/dkimpy-milter/dkimpy-milter.conf.sample
 
 .include <bsd.port.mk>
diff --git a/mail/py-dkimpy/Makefile b/mail/py-dkimpy/Makefile
index cf09126645fb..fa3577d7125e 100644
--- a/mail/py-dkimpy/Makefile
+++ b/mail/py-dkimpy/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	dkimpy
 DISTVERSION=	1.1.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@caomhin.org
 COMMENT=	Python library for DKIM email signing and verification
 WWW=		https://launchpad.net/dkimpy
 
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}authres>=0:mail/py-authres@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}aiodns>0:dns/py-aiodns@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pynacl>=0:security/py-pynacl@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}PyNaCl>=0:security/py-pynacl@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/net-im/py-unmessage/Makefile b/net-im/py-unmessage/Makefile
index ba33f20751c7..3843f499fb0c 100644
--- a/net-im/py-unmessage/Makefile
+++ b/net-im/py-unmessage/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=	unmessage
 DISTVERSION=	0.2.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	net-im net-p2p python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Privacy enhanced instant messenger
 WWW=		https://github.com/AnemoneLabs/unmessage
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	tor:security/tor \
 		${PYTHON_PKGNAMEPREFIX}opuslib>=1.1.0:audio/py-opuslib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyaudio>=0.2.10:audio/py-pyaudio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyaxo>=0.7.3:security/py-pyaxo@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pynacl>=1.0.1:security/py-pynacl@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}PyNaCl>=1.0.1:security/py-pynacl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyperclip>=1.5.27:devel/py-pyperclip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}twisted>=16.6.0:devel/py-twisted@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}txtorcon>=0.19.0:security/py-txtorcon@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR}
 # Twisted[tls]
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pyopenssl>=16.0.0:security/py-pyopenssl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}service-identity>0:security/py-service-identity@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}idna>=0.6:dns/py-idna@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/py-napalm-logs/Makefile b/net-mgmt/py-napalm-logs/Makefile
index bbed3cbe5d25..dc23212c3f01 100644
--- a/net-mgmt/py-napalm-logs/Makefile
+++ b/net-mgmt/py-napalm-logs/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	napalm-logs
 DISTVERSION=	0.9.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-mgmt python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
 COMMENT=	Cross-vendor normalisation for network syslog messages
 WWW=		https://github.com/napalm-automation/napalm-logs
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pynacl>0:security/py-pynacl@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}PyNaCl>0:security/py-pynacl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyzmq>0:net/py-pyzmq@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}u-msgpack-python>0:devel/py-u-msgpack-python@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}prometheus-client>0:net-mgmt/py-prometheus-client@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
 USES=		python
 USE_GITHUB=	yes
 GH_ACCOUNT=	napalm-automation
 USE_PYTHON=	distutils concurrent autoplist
 
 NO_ARCH=	yes
 SUB_FILES=	pkg-message
 SUB_LIST=	PREFIX=${PREFIX} PYTHON_VER=${PYTHON_VER}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \
 		${WRKSRC}/napalm_logs/config/__init__.py
 
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs -c /dev/null
 
 .include <bsd.port.mk>
diff --git a/net-p2p/warpinator/Makefile b/net-p2p/warpinator/Makefile
index c27a48e3971a..659ad399a139 100644
--- a/net-p2p/warpinator/Makefile
+++ b/net-p2p/warpinator/Makefile
@@ -1,47 +1,47 @@
 PORTNAME=	warpinator
 DISTVERSION=	1.8.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-p2p gnome
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	vidar@karlsen.tech
 COMMENT=	Share files across the LAN
 WWW=		https://github.com/linuxmint/warpinator
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}grpcio-tools>0:devel/py-grpcio-tools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qrcode>0:textproc/py-qrcode@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}grpcio>=1.16.0:devel/py-grpcio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ifaddr>0:net/py-ifaddr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netifaces>=0:net/py-netifaces@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pynacl>=0:security/py-pynacl@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}PyNaCl>=0:security/py-pynacl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-xapp>=1.6.0:x11/py-python-xapp@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setproctitle>=0:devel/py-setproctitle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}zeroconf>=0.27.0:net/py-zeroconf@${PY_FLAVOR} \
 		xapp>=0:x11/xapp
 
 USES=		gettext gnome meson python shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	linuxmint
 USE_GNOME=	glib20 gtk30 pygobject3
 GLIB_SCHEMAS=	org.x.Warpinator.gschema.xml
 
 SHEBANG_FILES=	bin/warpinator-send.in bin/warpinator.in data/warpinator-send-check \
 		generate-protobuf testing/testrun
 SHEBANG_GLOB=	*.py
 MESON_ARGS=	-Dbundle-grpc=false \
 		-Dbundle-zeroconf=false \
 		-Dflatpak-build=false \
 		-Dinclude-firewall-mod=false
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 NO_ARCH=	yes
 
 pre-build:
 	cd ${WRKSRC} && ./generate-protobuf
 
 .include <bsd.port.mk>
diff --git a/net/py-magic-wormhole/Makefile b/net/py-magic-wormhole/Makefile
index ce44465046a4..035afc868935 100644
--- a/net/py-magic-wormhole/Makefile
+++ b/net/py-magic-wormhole/Makefile
@@ -1,57 +1,57 @@
 PORTNAME=	magic-wormhole
 DISTVERSION=	0.16.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Get things from one computer to another, safely
 WWW=		https://github.com/warner/magic-wormhole
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}attrs>=19.2.0:devel/py-attrs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}autobahn>=0.14.1:www/py-autobahn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Automat>=0.3.0:devel/py-Automat@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}hkdf>=0.0.3:security/py-hkdf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}humanize>=0:devel/py-humanize@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}iterable-io>=1.0.0:devel/py-iterable-io@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pynacl>=0.3.0:security/py-pynacl@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}PyNaCl>=0.3.0:security/py-pynacl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}spake2>=0.8:security/py-spake2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tqdm>=4.13.0:misc/py-tqdm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}twisted>=17.5.0:devel/py-twisted@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}txtorcon>=18.0.2:security/py-txtorcon@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}zipstream-ng>=1.7.1:archivers/py-zipstream-ng@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist cryptography distutils
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	BASH FISH ZSH
 OPTIONS_DEFAULT=	BASH FISH ZSH
 
 BASH_PLIST_FILES=	share/bash-completion/completions/wormhole
 FISH_PLIST_FILES=	share/fish/completions/wormhole.fish
 ZSH_PLIST_FILES=        share/zsh/site-functions/_wormhole
 
 post-install-BASH-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions/
 	${INSTALL_SCRIPT} ${WRKSRC}/wormhole_complete.bash \
 		${STAGEDIR}${PREFIX}/share/bash-completion/completions/wormhole
 
 post-install-FISH-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/completions/
 	${INSTALL_DATA} ${WRKSRC}/wormhole_complete.fish \
 		${STAGEDIR}${PREFIX}/share/fish/completions/wormhole.fish
 
 post-install-ZSH-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
 	${INSTALL_DATA} ${WRKSRC}/wormhole_complete.zsh \
 		${STAGEDIR}${PREFIX}/share/zsh/site-functions/_wormhole
 
 .include <bsd.port.mk>
diff --git a/security/py-paramiko/Makefile b/security/py-paramiko/Makefile
index f6a957eefc17..aa82c76d859f 100644
--- a/security/py-paramiko/Makefile
+++ b/security/py-paramiko/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	paramiko
 PORTVERSION=	3.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sbz@FreeBSD.org
 COMMENT=	Python SSH2 protocol library
 WWW=		https://www.paramiko.org/
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bcrypt>=3.1.3:security/py-bcrypt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.7:devel/py-pyasn1@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pynacl>=1.0.1:security/py-pynacl@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}PyNaCl>=1.0.1:security/py-pynacl@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}invoke>=0:devel/py-invoke@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-relaxed>=0:devel/py-pytest-relaxed@${PY_FLAVOR}
 
 USES=		cpe python
 USE_PYTHON=	autoplist cryptography distutils pytest
 
 NO_ARCH=	yes
 TEST_ARGS=	-p no:relaxed
 
 OPTIONS_DEFINE=		GSSAPI
 GSSAPI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gssapi>=1.4.1:security/py-gssapi@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/security/py-pyaff4/Makefile b/security/py-pyaff4/Makefile
index 88b90020b4d0..53040ae8df9c 100644
--- a/security/py-pyaff4/Makefile
+++ b/security/py-pyaff4/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	pyaff4
 DISTVERSION=	0.26.post6
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	security devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	antoine@FreeBSD.org
 COMMENT=	Python Advanced Forensic Format Version 4 library
 WWW=		https://www.aff4.org/
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-snappy>=0.5.1:archivers/py-python-snappy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rdflib>=4.2.2:textproc/py-rdflib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}intervaltree>=2.1.0:devel/py-intervaltree@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}expiringdict>=1.1.4:devel/py-expiringdict@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}html5lib-modern>=0:www/py-html5lib-modern@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pynacl>0:security/py-pynacl@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}PyNaCl>0:security/py-pynacl@${PY_FLAVOR}
 
 NO_ARCH=	yes
 USES=		python zip
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/security/py-pyaxo/Makefile b/security/py-pyaxo/Makefile
index deddb6f518e6..a87e60fe8b3d 100644
--- a/security/py-pyaxo/Makefile
+++ b/security/py-pyaxo/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	pyaxo
 DISTVERSION=	0.8.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	security net python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python implementation of the Axolotl ratchet protocol
 WWW=		https://github.com/rxcomm/pyaxo
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}passlib>=1.6.1:security/py-passlib@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pynacl>=1.0.1:security/py-pynacl@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}PyNaCl>=1.0.1:security/py-pynacl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e "/'pytest-runner',/d" ${WRKSRC}/setup.py
 
 do-test:
 	@(cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs)
 
 .include <bsd.port.mk>
diff --git a/security/py-pymacaroons/Makefile b/security/py-pymacaroons/Makefile
index ccdb07733895..1b0e15cdbca3 100644
--- a/security/py-pymacaroons/Makefile
+++ b/security/py-pymacaroons/Makefile
@@ -1,25 +1,25 @@
 PORTNAME=	pymacaroons
 PORTVERSION=	0.13.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Macaroon library for Python
 WWW=		https://github.com/ecordell/pymacaroons
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pynacl>=1.1.2<2.0:security/py-pynacl@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}PyNaCl>=1.1.2<2.0:security/py-pynacl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/security/py-pynacl/Makefile b/security/py-pynacl/Makefile
index 80500bd89e6b..9df900a53550 100644
--- a/security/py-pynacl/Makefile
+++ b/security/py-pynacl/Makefile
@@ -1,37 +1,45 @@
-PORTNAME=	pynacl
-DISTVERSION=	1.5.0
-PORTREVISION=	3
+PORTNAME=	PyNaCl
+DISTVERSION=	1.6.2
 CATEGORIES=	security python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	PyNaCl-${PORTVERSION}
+DISTNAME=	${PORTNAME:tl}-${PORTVERSION}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python binding to the Networking and Cryptography library
 WWW=		https://github.com/pyca/pynacl
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>=1.4.1:devel/py-cffi@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}wheel>=0.29.0:devel/py-wheel@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>=1.4.1:devel/py-cffi@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=3.2.1:devel/py-pytest@${PY_FLAVOR} \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=61.0.0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0.29.0:devel/py-wheel@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}cffi>=2.0.0:devel/py-cffi@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>=2.0.0:devel/py-cffi@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=7.4.0:devel/py-pytest@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-cov>=2.10.1:devel/py-pytest-cov@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-xdist>=3.5.0:devel/py-pytest-xdist@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}hypothesis>=3.27.0:devel/py-hypothesis@${PY_FLAVOR}
 
 USES=		python localbase
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	pep517 autoplist
 
 OPTIONS_DEFINE=	BUNDLED_NACL
 BUNDLED_NACL_DESC=	Use bundled NaCl version
 BUNDLED_NACL_LIB_DEPENDS_OFF=	libsodium.so:security/libsodium
 BUNDLED_NACL_MAKE_ENV_OFF=	SODIUM_INSTALL=system
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/nacl/_sodium*.so
 
 do-test: # tests fail: https://github.com/pyca/pynacl/issues/747
 	@cd ${WRKSRC} && ${SETENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} ${PYTHON_CMD} -m pytest -rs tests
 
+# tests as of 1.6.2:
+# Results (15.25s):
+#          6 failed # failures are due to missing fixtures
+#      14003 passed
+#         10 skipped
+#          1 warning
+
 .include <bsd.port.mk>
diff --git a/security/py-pynacl/distinfo b/security/py-pynacl/distinfo
index e27ca9b810f2..ed9388125304 100644
--- a/security/py-pynacl/distinfo
+++ b/security/py-pynacl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1641968286
-SHA256 (PyNaCl-1.5.0.tar.gz) = 8ac7448f09ab85811607bdd21ec2464495ac8b7c66d146bf545b0f08fb9220ba
-SIZE (PyNaCl-1.5.0.tar.gz) = 3392854
+TIMESTAMP = 1773614971
+SHA256 (pynacl-1.6.2.tar.gz) = 018494d6d696ae03c7e656e5e74cdfd8ea1326962cc401bcf018f1ed8436811c
+SIZE (pynacl-1.6.2.tar.gz) = 3511692
diff --git a/security/py-signedjson/Makefile b/security/py-signedjson/Makefile
index e0d0e9852d42..566bced316e8 100644
--- a/security/py-signedjson/Makefile
+++ b/security/py-signedjson/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	signedjson
 PORTVERSION=	1.1.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Sign JSON with Ed25519 signatures
 WWW=		https://github.com/matrix-org/python-signedjson
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools-scm>=0:devel/py-setuptools-scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}canonicaljson>=1.0.0:devel/py-canonicaljson@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pynacl>=0.3.0:security/py-pynacl@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}PyNaCl>=0.3.0:security/py-pynacl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}unpaddedbase64>=1.0.1:devel/py-unpaddedbase64@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517 pytest
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/www/onionshare-cli/Makefile b/www/onionshare-cli/Makefile
index 8bb7679932e9..66d2f0c3e914 100644
--- a/www/onionshare-cli/Makefile
+++ b/www/onionshare-cli/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	onionshare-cli
 PORTVERSION=	2.6
 DISTNAME=	onionshare_cli-${PORTVERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www security python
 MASTER_SITES=   PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	egypcio@FreeBSD.org
 COMMENT=	Secure and anonymous file sharing via Tor (CLI version)
 WWW=		https://onionshare.org
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}poetry-core>=0:devel/py-poetry-core@${PY_FLAVOR}
 RUN_DEPENDS=	meek-client:security/meek \
 		obfs4proxy:security/obfs4proxy-tor \
 		snowflake-client:security/snowflake-tor \
 		tor:security/tor \
 		${PYTHON_PKGNAMEPREFIX}cepa>=0:net/py-cepa@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click>=0:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}colorama>=0:devel/py-colorama@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}flask>=0:www/py-flask@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}flask-socketio>=0:www/py-flask-socketio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gevent-websocket>=0:www/py-gevent-websocket@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=0:sysutils/py-psutil@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pynacl>=0:security/py-pynacl@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}PyNaCl>=0:security/py-pynacl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pysocks>=0:net/py-pysocks@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}unidecode>=0:converters/py-unidecode@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}urllib3>=0:net/py-urllib3@${PY_FLAVOR}
 
 USES=		cpe python
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/www/py-aiohttp-session/Makefile b/www/py-aiohttp-session/Makefile
index 324ebeafd54c..c65d170fe7ce 100644
--- a/www/py-aiohttp-session/Makefile
+++ b/www/py-aiohttp-session/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	aiohttp-session
 DISTVERSION=	2.11.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Web sessions for aiohttp web
 WWW=		https://github.com/aio-libs/aiohttp-session
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aiohttp>0:www/py-aiohttp@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}aioredis>0:databases/py-aioredis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}aiomcache>0:databases/py-aiomcache@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pycryptodome>0:security/py-pycryptodome@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}secure>0:security/py-secure@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pynacl>0:security/py-pynacl@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}PyNaCl>0:security/py-pynacl@${PY_FLAVOR}
 
 USES=		cpe python
 CPE_VENDOR=	${PORTNAME}_project
 USE_PYTHON=	autoplist distutils cython
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/www/py-autobahn/Makefile b/www/py-autobahn/Makefile
index 2fdbec00e903..d1016102a6f4 100644
--- a/www/py-autobahn/Makefile
+++ b/www/py-autobahn/Makefile
@@ -1,67 +1,67 @@
 PORTNAME=	autobahn
 DISTVERSIONPREFIX=	v
 DISTVERSION=	24.4.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	www python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	WebSocket client & server library, WAMP real-time framework
 WWW=		https://github.com/crossbario/autobahn-python
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hyperlink>=21.0.0:www/py-hyperlink@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}txaio>=21.2.1:devel/py-txaio@${PY_FLAVOR}
 
 USES=		cpe python
 CPE_VENDOR=	crossbar
 USE_GITHUB=	yes
 GH_ACCOUNT=	crossbario
 GH_PROJECT=	autobahn-python
 USE_PYTHON=	autoplist cryptography distutils pytest
 
 OPTIONS_DEFINE=		COMPRESS ENCRYPTION SCRAM SERIALIZATION
 OPTIONS_DEFAULT=	ENCRYPTION SCRAM SERIALIZATION TWISTED
 OPTIONS_MULTI=		BACKENDS
 OPTIONS_MULTI_BACKENDS=	TWISTED
 OPTIONS_FILE=		${PORT_DBDIR}/${OPTIONS_NAME}/${FLAVOR}-options
 
 BACKENDS_DESC=		Network Backends
 COMPRESS_DESC=		Compression support
 ENCRYPTION_DESC=	TLS Transport / Cryptosign Encryption & Authentication
 SCRAM_DESC=		WAMP-SCRAM Authentication support
 SERIALIZATION_DESC=	Serializers (MessagePack, CBOR, UBJSON, Flatbuffers)
 TWISTED_DESC=		Twisted network backend support
 
 COMPRESS_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}python-snappy>=0.6.0:archivers/py-python-snappy@${PY_FLAVOR}
 ENCRYPTION_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}pyopenssl>=20.0.1:security/py-pyopenssl@${PY_FLAVOR} \
-				${PYTHON_PKGNAMEPREFIX}pynacl>=1.4.0:security/py-pynacl@${PY_FLAVOR} \
+				${PYTHON_PKGNAMEPREFIX}PyNaCl>=1.4.0:security/py-pynacl@${PY_FLAVOR} \
 				${PYTHON_PKGNAMEPREFIX}qrcode>=7.3.1:textproc/py-qrcode@${PY_FLAVOR} \
 				${PYTHON_PKGNAMEPREFIX}pytrie>=0.4.0:devel/py-pytrie@${PY_FLAVOR} \
 				${PYTHON_PKGNAMEPREFIX}service-identity>=18.1.0:security/py-service-identity@${PY_FLAVOR}
 SCRAM_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}argon2-cffi>=20.1.0:security/py-argon2-cffi@${PY_FLAVOR} \
 				${PYTHON_PKGNAMEPREFIX}cffi>=1.14.5:devel/py-cffi@${PY_FLAVOR} \
 				${PYTHON_PKGNAMEPREFIX}passlib>=1.7.4:security/py-passlib@${PY_FLAVOR}
 SERIALIZATION_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cbor2>=5.2.0:devel/py-cbor2@${PY_FLAVOR} \
 				${PYTHON_PKGNAMEPREFIX}flatbuffers>=22.12.6:devel/py-flatbuffers@${PY_FLAVOR} \
 				${PYTHON_PKGNAMEPREFIX}msgpack>=1.0.2:devel/py-msgpack@${PY_FLAVOR} \
 				${PYTHON_PKGNAMEPREFIX}py-ubjson>=0.16.1:devel/py-py-ubjson@${PY_FLAVOR} \
 				${PYTHON_PKGNAMEPREFIX}ujson>=4.0.2:devel/py-ujson@${PY_FLAVOR} \
 				${PYTHON_PKGNAMEPREFIX}u-msgpack-python>=2.1:devel/py-u-msgpack-python@${PY_FLAVOR}
 TWISTED_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}attrs>=20.3.0:devel/py-attrs@${PY_FLAVOR} \
 				${PYTHON_PKGNAMEPREFIX}twisted>=24.3.0:devel/py-twisted@${PY_FLAVOR} \
 				${PYTHON_PKGNAMEPREFIX}zope.interface>=5.2.0:devel/py-zope.interface@${PY_FLAVOR}
 
 .include <bsd.port.options.mk>
 
 post-stage:
 .if ${ARCH} !=	armv7
 	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_nvx_utf8validator.abi3.so
 .endif
 
 do-test-TWISTED-on:
 	@cd ${WRKSRC} && USE_TWISTED=1 ${PYTHON_CMD} -m twisted.trial ${WRKSRC}/autobahn
 
 .include <bsd.port.mk>