diff --git a/security/git-credential-gopass/Makefile b/security/git-credential-gopass/Makefile
index ecea80657da5..c1086e8a6df0 100644
--- a/security/git-credential-gopass/Makefile
+++ b/security/git-credential-gopass/Makefile
@@ -1,22 +1,21 @@
 PORTNAME=	git-credential-gopass
-PORTVERSION=	1.15.11
-PORTREVISION=	2
+PORTVERSION=	1.15.12
 DISTVERSIONPREFIX=	v
 CATEGORIES=	security
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Manage git credentials using gopass
 WWW=		https://github.com/gopasspw/git-credential-gopass
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		go:modules
+USES=		go:1.22,modules
 USE_GITHUB=	yes
 GH_ACCOUNT=	gopasspw
 
 GO_MODULE=	github.com/${GH_ACCOUNT}/${PORTNAME}
 
 PLIST_FILES=	bin/git-credential-gopass
 
 .include <bsd.port.mk>
diff --git a/security/git-credential-gopass/distinfo b/security/git-credential-gopass/distinfo
index f0d76a15e8e4..1936a6af0cb9 100644
--- a/security/git-credential-gopass/distinfo
+++ b/security/git-credential-gopass/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1701616649
-SHA256 (go/security_git-credential-gopass/gopasspw-git-credential-gopass-v1.15.11_GH0/v1.15.11.mod) = 4cd6a2ef24afbc9ffaad50dcc090b8b6382fac64bd3db278321ef22086b4fcc8
-SIZE (go/security_git-credential-gopass/gopasspw-git-credential-gopass-v1.15.11_GH0/v1.15.11.mod) = 4214
-SHA256 (go/security_git-credential-gopass/gopasspw-git-credential-gopass-v1.15.11_GH0/v1.15.11.zip) = 494e745588faa9d5c561c0224b45c3a4ef88f83833df7ecde6f1f58efb3618c9
-SIZE (go/security_git-credential-gopass/gopasspw-git-credential-gopass-v1.15.11_GH0/v1.15.11.zip) = 30589
-SHA256 (go/security_git-credential-gopass/gopasspw-git-credential-gopass-v1.15.11_GH0/gopasspw-git-credential-gopass-v1.15.11_GH0.tar.gz) = b757672d283ee67371022ad68a0060eb798f5f89a1285bba6f4532ad71c8bda0
-SIZE (go/security_git-credential-gopass/gopasspw-git-credential-gopass-v1.15.11_GH0/gopasspw-git-credential-gopass-v1.15.11_GH0.tar.gz) = 24602
+TIMESTAMP = 1710800319
+SHA256 (go/security_git-credential-gopass/gopasspw-git-credential-gopass-v1.15.12_GH0/v1.15.12.mod) = 674e443069d9a7e0d28187deb1cb483f819a9dde7bfa3b1b4be9109f39d7b6d4
+SIZE (go/security_git-credential-gopass/gopasspw-git-credential-gopass-v1.15.12_GH0/v1.15.12.mod) = 4208
+SHA256 (go/security_git-credential-gopass/gopasspw-git-credential-gopass-v1.15.12_GH0/v1.15.12.zip) = 1ce4ff2c2ba6dd8d4e9d5d82e54d5d906e76263da3e0f178bf3502e71ab9ef31
+SIZE (go/security_git-credential-gopass/gopasspw-git-credential-gopass-v1.15.12_GH0/v1.15.12.zip) = 30626
+SHA256 (go/security_git-credential-gopass/gopasspw-git-credential-gopass-v1.15.12_GH0/gopasspw-git-credential-gopass-v1.15.12_GH0.tar.gz) = 896cb56ea64abe4808bf46ad19fbc32d809d292253c116dce6f4c3433f4d6a6e
+SIZE (go/security_git-credential-gopass/gopasspw-git-credential-gopass-v1.15.12_GH0/gopasspw-git-credential-gopass-v1.15.12_GH0.tar.gz) = 24647
diff --git a/www/py-httpcore/Makefile b/www/py-httpcore/Makefile
index 02a6fa6fa324..502eaa027d19 100644
--- a/www/py-httpcore/Makefile
+++ b/www/py-httpcore/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	httpcore
 PORTVERSION=	1.0.4
 CATEGORIES=	www python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Minimal low-level HTTP client
 WWW=		https://www.encode.io/httpcore/ \
 		https://github.com/encode/httpcore
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hatch-fancy-pypi-readme>=0:devel/py-hatch-fancy-pypi-readme@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}hatchling>=0:devel/py-hatchling@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}h11>=0.13<0.15:net/py-h11@${PY_FLAVOR} \
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	ASYNCIO HTTP2 SOCKS TRIO
 OPTIONS_DEFAULT=ASYNCIO HTTP2
 ASYNCIO_DESC=	Asynchronous support via anyio
 HTTP2_DESC=	HTTP/2 support
 TRIO_DESC=	Asynchronous support via trio
 
 ASYNCIO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}anyio>=4.0<5.0:devel/py-anyio@${PY_FLAVOR}
 HTTP2_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}h2>=3<5:www/py-h2@${PY_FLAVOR}
 SOCKS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}socksio>=1<2:net/py-socksio@${PY_FLAVOR}
-TRIO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}trio>=0.22.0<0.25.0:net/py-trio@${PY_FLAVOR}
+TRIO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}trio>=0.22.0<=0.25.0:net/py-trio@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/www/py-httpcore/files/patch-pyproject.toml b/www/py-httpcore/files/patch-pyproject.toml
new file mode 100644
index 000000000000..9b209cc82ab5
--- /dev/null
+++ b/www/py-httpcore/files/patch-pyproject.toml
@@ -0,0 +1,11 @@
+--- pyproject.toml.orig	2020-02-02 00:00:00 UTC
++++ pyproject.toml
+@@ -41,7 +41,7 @@ trio = [
+     "socksio==1.*",
+ ]
+ trio = [
+-    "trio>=0.22.0,<0.25.0",
++    "trio>=0.22.0,<=0.25.0",
+ ]
+ asyncio = [
+     "anyio>=4.0,<5.0",