diff --git a/sysutils/buildah/Makefile b/sysutils/buildah/Makefile
index 4eb766cee32a..eefbf3cf2881 100644
--- a/sysutils/buildah/Makefile
+++ b/sysutils/buildah/Makefile
@@ -1,30 +1,29 @@
 PORTNAME=	buildah
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.38.1
-PORTREVISION=	3
+DISTVERSION=	1.40.1
 CATEGORIES=	sysutils
 
 MAINTAINER=	dfr@FreeBSD.org
 COMMENT=	Manage Pods, Containers and Container Images
 WWW=		https://buildah.io/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	as:devel/binutils \
 		bash:shells/bash \
 		go-md2man:textproc/go-md2man \
 		gsed:textproc/gsed
 LIB_DEPENDS=	libgpgme.so:security/gpgme
 RUN_DEPENDS=	containernetworking-plugins>=0:net/containernetworking-plugins \
 		containers-common>=0:sysutils/containers-common \
 		ocijail:sysutils/ocijail
 
-USES=		gmake go:no_targets,1.22 pkgconfig
+USES=		gmake go:no_targets,1.23 pkgconfig
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	containers
 GH_PROJECT=	buildah
 INSTALL_TARGET=	install install.completions
 
 .include <bsd.port.mk>
diff --git a/sysutils/buildah/distinfo b/sysutils/buildah/distinfo
index 56588414a7d4..116b4b83ced5 100644
--- a/sysutils/buildah/distinfo
+++ b/sysutils/buildah/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738598545
-SHA256 (containers-buildah-v1.38.1_GH0.tar.gz) = d0d5996207b80de8ed39b0fe2563617e538309fefc1c0a707c43832d1cd82c9f
-SIZE (containers-buildah-v1.38.1_GH0.tar.gz) = 18550893
+TIMESTAMP = 1750102691
+SHA256 (containers-buildah-v1.40.1_GH0.tar.gz) = 27678b7ced9f096c34d19c12922d8cc9eea2464e4c59dcb249f0f717b80c50bc
+SIZE (containers-buildah-v1.40.1_GH0.tar.gz) = 12329760
diff --git a/sysutils/buildah/files/patch-vendor_github.com_containers_common_pkg_config_config.go b/sysutils/buildah/files/patch-vendor_github.com_containers_common_pkg_config_config.go
deleted file mode 100644
index 5e0faca26083..000000000000
--- a/sysutils/buildah/files/patch-vendor_github.com_containers_common_pkg_config_config.go
+++ /dev/null
@@ -1,35 +0,0 @@
---- vendor/github.com/containers/common/pkg/config/config.go.orig	2025-01-20 18:22:54 UTC
-+++ vendor/github.com/containers/common/pkg/config/config.go
-@@ -12,7 +12,6 @@ import (
- 
- 	"github.com/containers/common/internal/attributedstring"
- 	"github.com/containers/common/libnetwork/types"
--	"github.com/containers/common/pkg/capabilities"
- 	"github.com/containers/storage/pkg/fileutils"
- 	"github.com/containers/storage/pkg/unshare"
- 	units "github.com/docker/go-units"
-@@ -963,24 +962,6 @@ func (c *Config) GetDefaultEnvEx(envHost, httpProxy bo
- 		}
- 	}
- 	return append(env, c.Containers.Env.Get()...)
--}
--
--// Capabilities returns the capabilities parses the Add and Drop capability
--// list from the default capabilities for the container
--func (c *Config) Capabilities(user string, addCapabilities, dropCapabilities []string) ([]string, error) {
--	userNotRoot := func(user string) bool {
--		if user == "" || user == "root" || user == "0" {
--			return false
--		}
--		return true
--	}
--
--	defaultCapabilities := c.Containers.DefaultCapabilities.Get()
--	if userNotRoot(user) {
--		defaultCapabilities = []string{}
--	}
--
--	return capabilities.MergeCapabilities(defaultCapabilities, addCapabilities, dropCapabilities)
- }
- 
- // Device parses device mapping string to a src, dest & permissions string
diff --git a/sysutils/buildah/files/patch-vendor_github.com_containers_common_pkg_config_config__linux.go b/sysutils/buildah/files/patch-vendor_github.com_containers_common_pkg_config_config__linux.go
deleted file mode 100644
index 2e60526c7ecd..000000000000
--- a/sysutils/buildah/files/patch-vendor_github.com_containers_common_pkg_config_config__linux.go
+++ /dev/null
@@ -1,33 +0,0 @@
---- vendor/github.com/containers/common/pkg/config/config_linux.go.orig	2025-01-20 18:22:54 UTC
-+++ vendor/github.com/containers/common/pkg/config/config_linux.go
-@@ -1,6 +1,7 @@ import (
- package config
- 
- import (
-+	"github.com/containers/common/pkg/capabilities"
- 	selinux "github.com/opencontainers/selinux/go-selinux"
- )
- 
-@@ -25,4 +26,22 @@ var defaultHelperBinariesDir = []string{
- 	"/usr/local/lib/podman",
- 	"/usr/libexec/podman",
- 	"/usr/lib/podman",
-+}
-+
-+// Capabilities returns the capabilities parses the Add and Drop capability
-+// list from the default capabilities for the container
-+func (c *Config) Capabilities(user string, addCapabilities, dropCapabilities []string) ([]string, error) {
-+	userNotRoot := func(user string) bool {
-+		if user == "" || user == "root" || user == "0" {
-+			return false
-+		}
-+		return true
-+	}
-+
-+	defaultCapabilities := c.Containers.DefaultCapabilities.Get()
-+	if userNotRoot(user) {
-+		defaultCapabilities = []string{}
-+	}
-+
-+	return capabilities.MergeCapabilities(defaultCapabilities, addCapabilities, dropCapabilities)
- }
diff --git a/sysutils/buildah/files/patch-vendor_github.com_containers_common_pkg_config_config__unsupported.go b/sysutils/buildah/files/patch-vendor_github.com_containers_common_pkg_config_config__unsupported.go
deleted file mode 100644
index 3940ab594954..000000000000
--- a/sysutils/buildah/files/patch-vendor_github.com_containers_common_pkg_config_config__unsupported.go
+++ /dev/null
@@ -1,12 +0,0 @@
---- vendor/github.com/containers/common/pkg/config/config_unsupported.go.orig	2025-01-20 18:22:54 UTC
-+++ vendor/github.com/containers/common/pkg/config/config_unsupported.go
-@@ -5,3 +5,9 @@ func selinuxEnabled() bool {
- func selinuxEnabled() bool {
- 	return false
- }
-+
-+// Capabilities returns the capabilities parses the Add and Drop capability
-+// list from the default capabilities for the container
-+func (c *Config) Capabilities(user string, addCapabilities, dropCapabilities []string) ([]string, error) {
-+	return nil, nil
-+}
diff --git a/sysutils/buildah/files/patch-vendor_github.com_containers_storage_pkg_chunked_storage__unsupported.go b/sysutils/buildah/files/patch-vendor_github.com_containers_storage_pkg_chunked_storage__unsupported.go
deleted file mode 100644
index d17e29d695ee..000000000000
--- a/sysutils/buildah/files/patch-vendor_github.com_containers_storage_pkg_chunked_storage__unsupported.go
+++ /dev/null
@@ -1,9 +0,0 @@
---- vendor/github.com/containers/storage/pkg/chunked/storage_unsupported.go.orig	2025-02-04 11:32:21 UTC
-+++ vendor/github.com/containers/storage/pkg/chunked/storage_unsupported.go
-@@ -13,5 +13,5 @@ func GetDiffer(ctx context.Context, store storage.Stor
- 
- // GetDiffer returns a differ than can be used with ApplyDiffWithDiffer.
- func GetDiffer(ctx context.Context, store storage.Store, blobDigest digest.Digest, blobSize int64, annotations map[string]string, iss ImageSourceSeekable) (graphdriver.Differ, error) {
--	return nil, errors.New("format not supported on this system")
-+	return nil, newErrFallbackToOrdinaryLayerDownload(errors.New("format not supported on this system"))
- }
diff --git a/sysutils/containers-common/Makefile b/sysutils/containers-common/Makefile
index e57f4549c2ff..bee209d11a5f 100644
--- a/sysutils/containers-common/Makefile
+++ b/sysutils/containers-common/Makefile
@@ -1,55 +1,55 @@
 PORTNAME=	containers-common
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.61.1
+DISTVERSION=	0.63.1
 CATEGORIES=	sysutils
 
 MAINTAINER=	dfr@FreeBSD.org
 COMMENT=	Common manpages and config files for podman and buildah
 WWW=		https://github.com/containers
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC_common}/LICENSE
 
 BUILD_DEPENDS=	bash:shells/bash \
 		curl:ftp/curl \
 		go-md2man:textproc/go-md2man
 
 USES=		gmake
 
 USE_GITHUB=	nodefault
 GH_ACCOUNT=	containers:common containers:image containers:skopeo \
 		containers:storage
 GH_PROJECT=	common:common image:image skopeo:skopeo storage:storage
 GH_TAGNAME=	v${DISTVERSION}:common v${IMAGEVERSION}:image \
 		v${SKOPEOVERSION}:skopeo v${STORAGEVERSION}:storage
 
 NO_ARCH=	yes
 
-IMAGEVERSION=	5.33.1
-SKOPEOVERSION=	1.17.0
-STORAGEVERSION=	1.56.1
+IMAGEVERSION=	5.35.0
+SKOPEOVERSION=	1.19.0
+STORAGEVERSION=	1.58.0
 
 do-build:
 	${GMAKE} -C ${WRKSRC_common}/docs
 	${GMAKE} -C ${WRKSRC_storage} install.tools
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/containers/certs.d
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/containers/hooks.d
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/containers/registries.d
 	${INSTALL_DATA} ${WRKSRC_skopeo}/default-policy.json \
 		${STAGEDIR}${PREFIX}/etc/containers/policy.json.sample
 # Temporary until https://github.com/containers/common/pull/1199 propagates to podman and buildah
 	${INSTALL_DATA} ${PATCHDIR}/containers.conf \
 		${STAGEDIR}${PREFIX}/etc/containers/containers.conf.sample
 	${INSTALL_DATA} ${WRKSRC_storage}/storage.conf-freebsd \
 		${STAGEDIR}${PREFIX}/etc/containers/storage.conf.sample
 	${INSTALL_DATA} ${WRKSRC_image}/registries.conf \
 		${STAGEDIR}${PREFIX}/etc/containers/registries.conf.sample
 	${GMAKE} -C ${WRKSRC_common}/docs DESTDIR=${STAGEDIR} install
 	${GMAKE} -C ${WRKSRC_image} PREFIX=${STAGEDIR}${PREFIX} install-docs
 	${GMAKE} -C ${WRKSRC_storage}/docs GOMD2MAN=${LOCALBASE}/bin/go-md2man \
 		containers-storage.conf.5
 	${INSTALL_MAN} ${WRKSRC_storage}/docs/containers-storage.conf.5 ${STAGEDIR}${PREFIX}/share/man/man5
 
 .include <bsd.port.mk>
diff --git a/sysutils/containers-common/distinfo b/sysutils/containers-common/distinfo
index 8835ccc636f1..1a6c1a0089a0 100644
--- a/sysutils/containers-common/distinfo
+++ b/sysutils/containers-common/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1738598026
-SHA256 (containers-common-v0.61.1_GH0.tar.gz) = 3eb531f28564ac78067945c59fa69a0c7c79131ad1e9cfc9f6404e6e8f907b53
-SIZE (containers-common-v0.61.1_GH0.tar.gz) = 13216471
-SHA256 (containers-image-v5.33.1_GH0.tar.gz) = c54581c03a950543fdeaa38296b98086d8ee15d359f375344e9b15145e8fa54b
-SIZE (containers-image-v5.33.1_GH0.tar.gz) = 738022
-SHA256 (containers-storage-v1.56.1_GH0.tar.gz) = 88feb5c4bf572cc92cec065f1edb388209c0094794f32eead438c09d640aaf05
-SIZE (containers-storage-v1.56.1_GH0.tar.gz) = 4227161
-SHA256 (containers-skopeo-v1.17.0_GH0.tar.gz) = e548c044c7b644ba455f482df387ec90aceea432b9c61a0bab0ec8534970eb69
-SIZE (containers-skopeo-v1.17.0_GH0.tar.gz) = 10682765
+TIMESTAMP = 1750104348
+SHA256 (containers-common-v0.63.1_GH0.tar.gz) = 6090742e60ebf99e1d9e1580711a9bb556b250551eeef7058aa2f681e93651b9
+SIZE (containers-common-v0.63.1_GH0.tar.gz) = 13515794
+SHA256 (containers-image-v5.35.0_GH0.tar.gz) = 1c2c4a87cd47d9c56d2794b71ae58d7b8f7dde284afb54abfab5f6c85f7ef4ec
+SIZE (containers-image-v5.35.0_GH0.tar.gz) = 766486
+SHA256 (containers-skopeo-v1.19.0_GH0.tar.gz) = 043e9f568440accf1aafca122a25c4d21441f16de49475192ec4abeef7430358
+SIZE (containers-skopeo-v1.19.0_GH0.tar.gz) = 10819827
+SHA256 (containers-storage-v1.58.0_GH0.tar.gz) = 51c689bcfcdcbb4c0192c9a99354db145b65bf4ced3a0f70efd01ec99f39f3f8
+SIZE (containers-storage-v1.58.0_GH0.tar.gz) = 4256083
diff --git a/sysutils/podman-suite/Makefile b/sysutils/podman-suite/Makefile
index fe500aa57d63..c322defdd711 100644
--- a/sysutils/podman-suite/Makefile
+++ b/sysutils/podman-suite/Makefile
@@ -1,22 +1,22 @@
 PORTNAME=	podman-suite
-PORTVERSION=	20250203
+PORTVERSION=	20250618
 CATEGORIES=	sysutils
 
 MAINTAINER=	dfr@FreeBSD.org
 COMMENT=	Metaport of Podman and Buildah toolkit
 WWW=		https://podman.io/
 
 USES=		metaport
 
 RUN_DEPENDS=	buildah>=0:sysutils/buildah \
 		catatonit>=0:sysutils/catatonit \
 		podman>=0:sysutils/podman \
 		skopeo>=0:sysutils/skopeo
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} != FreeBSD
 IGNORE=		not supported for this configuration
 .endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/podman/Makefile b/sysutils/podman/Makefile
index 2c243b6294e8..65c6a1c00031 100644
--- a/sysutils/podman/Makefile
+++ b/sysutils/podman/Makefile
@@ -1,46 +1,45 @@
 PORTNAME=	podman
 DISTVERSIONPREFIX=	v
-DISTVERSION=	5.3.2
-PORTREVISION=	3
+DISTVERSION=	5.5.1
 CATEGORIES=	sysutils
 
 MAINTAINER=	dfr@FreeBSD.org
 COMMENT=	Manage Pods, Containers and Container Images
 WWW=		https://podman.io/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	bash:shells/bash \
 		ggrep:textproc/gnugrep \
 		go-md2man:textproc/go-md2man \
 		gsed:textproc/gsed
 LIB_DEPENDS=	libgpgme.so:security/gpgme
 RUN_DEPENDS=	conmon:sysutils/conmon \
 		containernetworking-plugins>=0:net/containernetworking-plugins \
 		containers-common>=0:sysutils/containers-common \
 		ocijail:sysutils/ocijail
 
-USES=		gmake go:no_targets,1.22 pkgconfig python:build shebangfix
+USES=		gmake go:no_targets,1.23 pkgconfig python:build shebangfix
 USE_RC_SUBR=	podman podman_service
 
 SHEBANG_FILES=	${WRKSRC}/hack/markdown-preprocess
 MAKE_ARGS=	SHELL=${LOCALBASE}/bin/bash
 
 # Parallel builds are flaky due to some kind of file race in the
 # markdown-preprocess phase of the docs build.
 MAKE_JOBS_UNSAFE=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	containers
 GH_PROJECT=	podman
 
 INSTALL_TARGET=	install install.completions
 
 # Temporary until https://github.com/containers/podman/pull/16422 lands
 do-install:
 	${GMAKE} -C ${WRKSRC} ${MAKE_ARGS} DESTDIR=${STAGEDIR} GO=${GO_CMD} install
 	${GMAKE} -C ${WRKSRC} ${MAKE_ARGS} DESTDIR=${STAGEDIR} GO=${GO_CMD} install.completions
 	${RM} ${STAGEDIR}${PREFIX}/lib/tmpfiles.d/podman.conf
 
 .include <bsd.port.mk>
diff --git a/sysutils/podman/distinfo b/sysutils/podman/distinfo
index 75743cf73366..48cdbe5f6f89 100644
--- a/sysutils/podman/distinfo
+++ b/sysutils/podman/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738598697
-SHA256 (containers-podman-v5.3.2_GH0.tar.gz) = e7d7abf2d4ecae7217af017a4199d555563721bf6c3ae52e68704ee8268c432b
-SIZE (containers-podman-v5.3.2_GH0.tar.gz) = 24207488
+TIMESTAMP = 1750101580
+SHA256 (containers-podman-v5.5.1_GH0.tar.gz) = 00d02f85ad27a46e77456fef1be81865a43147544ed2487e6c4c8decd0e3748f
+SIZE (containers-podman-v5.5.1_GH0.tar.gz) = 21338501
diff --git a/sysutils/podman/files/patch-libpod_container__internal__common.go b/sysutils/podman/files/patch-libpod_container__internal__common.go
new file mode 100644
index 000000000000..9eeb358bca34
--- /dev/null
+++ b/sysutils/podman/files/patch-libpod_container__internal__common.go
@@ -0,0 +1,11 @@
+--- libpod/container_internal_common.go.orig	2025-06-18 16:07:27 UTC
++++ libpod/container_internal_common.go
+@@ -192,7 +192,7 @@ func (c *Container) createInitRootfs() error {
+ 	}
+ 
+ 	c.config.Rootfs = tmpDir
+-	c.config.RootfsOverlay = true
++	//c.config.RootfsOverlay = true
+ 	return nil
+ }
+ 
diff --git a/sysutils/podman/files/patch-libpod_runtime__migrate__freebsd.go b/sysutils/podman/files/patch-libpod_runtime__migrate__freebsd.go
deleted file mode 100644
index 5908c595098c..000000000000
--- a/sysutils/podman/files/patch-libpod_runtime__migrate__freebsd.go
+++ /dev/null
@@ -1,18 +0,0 @@
---- libpod/runtime_migrate_freebsd.go.orig	2024-10-03 14:39:32 UTC
-+++ libpod/runtime_migrate_freebsd.go
-@@ -0,0 +1,15 @@
-+//go:build !remote
-+
-+package libpod
-+
-+import (
-+	"errors"
-+)
-+
-+func (r *Runtime) stopPauseProcess() error {
-+	return nil
-+}
-+
-+func (r *Runtime) Migrate(newRuntime string) error {
-+	return errors.New("not implemented (*Runtime) migrate")
-+}
diff --git a/sysutils/podman/files/patch-libpod_runtime__migrate__unsupported.go b/sysutils/podman/files/patch-libpod_runtime__migrate__unsupported.go
deleted file mode 100644
index 0c38a6d35a56..000000000000
--- a/sysutils/podman/files/patch-libpod_runtime__migrate__unsupported.go
+++ /dev/null
@@ -1,8 +0,0 @@
---- libpod/runtime_migrate_unsupported.go.orig	2024-10-03 14:38:54 UTC
-+++ libpod/runtime_migrate_unsupported.go
-@@ -1,4 +1,4 @@
--//go:build !remote && !linux
-+//go:build !remote && !linux && !freebsd
- 
- package libpod
- 
diff --git a/sysutils/podman/files/patch-vendor_github.com_containers_common_pkg_config_config.go b/sysutils/podman/files/patch-vendor_github.com_containers_common_pkg_config_config.go
deleted file mode 100644
index efd0b17a0aef..000000000000
--- a/sysutils/podman/files/patch-vendor_github.com_containers_common_pkg_config_config.go
+++ /dev/null
@@ -1,35 +0,0 @@
---- vendor/github.com/containers/common/pkg/config/config.go.orig	2025-01-21 18:41:34 UTC
-+++ vendor/github.com/containers/common/pkg/config/config.go
-@@ -12,7 +12,6 @@ import (
- 
- 	"github.com/containers/common/internal/attributedstring"
- 	"github.com/containers/common/libnetwork/types"
--	"github.com/containers/common/pkg/capabilities"
- 	"github.com/containers/storage/pkg/fileutils"
- 	"github.com/containers/storage/pkg/unshare"
- 	units "github.com/docker/go-units"
-@@ -963,24 +962,6 @@ func (c *Config) GetDefaultEnvEx(envHost, httpProxy bo
- 		}
- 	}
- 	return append(env, c.Containers.Env.Get()...)
--}
--
--// Capabilities returns the capabilities parses the Add and Drop capability
--// list from the default capabilities for the container
--func (c *Config) Capabilities(user string, addCapabilities, dropCapabilities []string) ([]string, error) {
--	userNotRoot := func(user string) bool {
--		if user == "" || user == "root" || user == "0" {
--			return false
--		}
--		return true
--	}
--
--	defaultCapabilities := c.Containers.DefaultCapabilities.Get()
--	if userNotRoot(user) {
--		defaultCapabilities = []string{}
--	}
--
--	return capabilities.MergeCapabilities(defaultCapabilities, addCapabilities, dropCapabilities)
- }
- 
- // Device parses device mapping string to a src, dest & permissions string
diff --git a/sysutils/podman/files/patch-vendor_github.com_containers_common_pkg_config_config__linux.go b/sysutils/podman/files/patch-vendor_github.com_containers_common_pkg_config_config__linux.go
deleted file mode 100644
index cf91d1d981ef..000000000000
--- a/sysutils/podman/files/patch-vendor_github.com_containers_common_pkg_config_config__linux.go
+++ /dev/null
@@ -1,33 +0,0 @@
---- vendor/github.com/containers/common/pkg/config/config_linux.go.orig	2025-01-21 18:41:34 UTC
-+++ vendor/github.com/containers/common/pkg/config/config_linux.go
-@@ -1,6 +1,7 @@ import (
- package config
- 
- import (
-+	"github.com/containers/common/pkg/capabilities"
- 	selinux "github.com/opencontainers/selinux/go-selinux"
- )
- 
-@@ -25,4 +26,22 @@ var defaultHelperBinariesDir = []string{
- 	"/usr/local/lib/podman",
- 	"/usr/libexec/podman",
- 	"/usr/lib/podman",
-+}
-+
-+// Capabilities returns the capabilities parses the Add and Drop capability
-+// list from the default capabilities for the container
-+func (c *Config) Capabilities(user string, addCapabilities, dropCapabilities []string) ([]string, error) {
-+	userNotRoot := func(user string) bool {
-+		if user == "" || user == "root" || user == "0" {
-+			return false
-+		}
-+		return true
-+	}
-+
-+	defaultCapabilities := c.Containers.DefaultCapabilities.Get()
-+	if userNotRoot(user) {
-+		defaultCapabilities = []string{}
-+	}
-+
-+	return capabilities.MergeCapabilities(defaultCapabilities, addCapabilities, dropCapabilities)
- }
diff --git a/sysutils/podman/files/patch-vendor_github.com_containers_common_pkg_config_config__unsupported.go b/sysutils/podman/files/patch-vendor_github.com_containers_common_pkg_config_config__unsupported.go
deleted file mode 100644
index 96b618fe65ae..000000000000
--- a/sysutils/podman/files/patch-vendor_github.com_containers_common_pkg_config_config__unsupported.go
+++ /dev/null
@@ -1,12 +0,0 @@
---- vendor/github.com/containers/common/pkg/config/config_unsupported.go.orig	2025-01-21 18:41:34 UTC
-+++ vendor/github.com/containers/common/pkg/config/config_unsupported.go
-@@ -5,3 +5,9 @@ func selinuxEnabled() bool {
- func selinuxEnabled() bool {
- 	return false
- }
-+
-+// Capabilities returns the capabilities parses the Add and Drop capability
-+// list from the default capabilities for the container
-+func (c *Config) Capabilities(user string, addCapabilities, dropCapabilities []string) ([]string, error) {
-+	return nil, nil
-+}
diff --git a/sysutils/podman/files/patch-vendor_github.com_containers_storage_pkg_chunked_storage__unsupported.go b/sysutils/podman/files/patch-vendor_github.com_containers_storage_pkg_chunked_storage__unsupported.go
deleted file mode 100644
index d17e29d695ee..000000000000
--- a/sysutils/podman/files/patch-vendor_github.com_containers_storage_pkg_chunked_storage__unsupported.go
+++ /dev/null
@@ -1,9 +0,0 @@
---- vendor/github.com/containers/storage/pkg/chunked/storage_unsupported.go.orig	2025-02-04 11:32:21 UTC
-+++ vendor/github.com/containers/storage/pkg/chunked/storage_unsupported.go
-@@ -13,5 +13,5 @@ func GetDiffer(ctx context.Context, store storage.Stor
- 
- // GetDiffer returns a differ than can be used with ApplyDiffWithDiffer.
- func GetDiffer(ctx context.Context, store storage.Store, blobDigest digest.Digest, blobSize int64, annotations map[string]string, iss ImageSourceSeekable) (graphdriver.Differ, error) {
--	return nil, errors.New("format not supported on this system")
-+	return nil, newErrFallbackToOrdinaryLayerDownload(errors.New("format not supported on this system"))
- }
diff --git a/sysutils/podman/pkg-plist b/sysutils/podman/pkg-plist
index 60a484d79067..c7a1db09da81 100644
--- a/sysutils/podman/pkg-plist
+++ b/sysutils/podman/pkg-plist
@@ -1,233 +1,242 @@
 bin/podman
 bin/podman-remote
 bin/podmansh
 share/bash-completion/completions/podman
 share/bash-completion/completions/podman-remote
 share/fish/vendor_completions.d/podman-remote.fish
 share/fish/vendor_completions.d/podman.fish
+share/man/man1/podman-artifact-add.1.gz
+share/man/man1/podman-artifact-extract.1.gz
+share/man/man1/podman-artifact-inspect.1.gz
+share/man/man1/podman-artifact-ls.1.gz
+share/man/man1/podman-artifact-pull.1.gz
+share/man/man1/podman-artifact-push.1.gz
+share/man/man1/podman-artifact-rm.1.gz
+share/man/man1/podman-artifact.1.gz
 share/man/man1/podman-attach.1.gz
 share/man/man1/podman-auto-update.1.gz
 share/man/man1/podman-build.1.gz
 share/man/man1/podman-commit.1.gz
 share/man/man1/podman-completion.1.gz
 share/man/man1/podman-compose.1.gz
 share/man/man1/podman-container-attach.1.gz
 share/man/man1/podman-container-checkpoint.1.gz
 share/man/man1/podman-container-cleanup.1.gz
 share/man/man1/podman-container-clone.1.gz
 share/man/man1/podman-container-commit.1.gz
 share/man/man1/podman-container-cp.1.gz
 share/man/man1/podman-container-create.1.gz
 share/man/man1/podman-container-diff.1.gz
 share/man/man1/podman-container-exec.1.gz
 share/man/man1/podman-container-exists.1.gz
 share/man/man1/podman-container-export.1.gz
 share/man/man1/podman-container-init.1.gz
 share/man/man1/podman-container-inspect.1.gz
 share/man/man1/podman-container-kill.1.gz
 share/man/man1/podman-container-list.1.gz
 share/man/man1/podman-container-logs.1.gz
 share/man/man1/podman-container-ls.1.gz
 share/man/man1/podman-container-mount.1.gz
 share/man/man1/podman-container-pause.1.gz
 share/man/man1/podman-container-port.1.gz
 share/man/man1/podman-container-prune.1.gz
 share/man/man1/podman-container-ps.1.gz
 share/man/man1/podman-container-rename.1.gz
 share/man/man1/podman-container-restart.1.gz
 share/man/man1/podman-container-restore.1.gz
 share/man/man1/podman-container-rm.1.gz
 share/man/man1/podman-container-run.1.gz
 share/man/man1/podman-container-runlabel.1.gz
 share/man/man1/podman-container-start.1.gz
 share/man/man1/podman-container-stats.1.gz
 share/man/man1/podman-container-stop.1.gz
 share/man/man1/podman-container-top.1.gz
 share/man/man1/podman-container-umount.1.gz
 share/man/man1/podman-container-unmount.1.gz
 share/man/man1/podman-container-unpause.1.gz
 share/man/man1/podman-container-update.1.gz
 share/man/man1/podman-container-wait.1.gz
 share/man/man1/podman-container.1.gz
 share/man/man1/podman-cp.1.gz
 share/man/man1/podman-create.1.gz
 share/man/man1/podman-diff.1.gz
 share/man/man1/podman-events.1.gz
 share/man/man1/podman-exec.1.gz
 share/man/man1/podman-export.1.gz
 share/man/man1/podman-farm-build.1.gz
 share/man/man1/podman-farm-create.1.gz
 share/man/man1/podman-farm-list.1.gz
 share/man/man1/podman-farm-remove.1.gz
 share/man/man1/podman-farm-update.1.gz
 share/man/man1/podman-farm.1.gz
 share/man/man1/podman-generate-kube.1.gz
 share/man/man1/podman-generate-spec.1.gz
 share/man/man1/podman-generate-systemd.1.gz
 share/man/man1/podman-generate.1.gz
 share/man/man1/podman-healthcheck-run.1.gz
 share/man/man1/podman-healthcheck.1.gz
 share/man/man1/podman-help.1.gz
 share/man/man1/podman-history.1.gz
 share/man/man1/podman-image-build.1.gz
 share/man/man1/podman-image-diff.1.gz
 share/man/man1/podman-image-exists.1.gz
 share/man/man1/podman-image-history.1.gz
 share/man/man1/podman-image-import.1.gz
 share/man/man1/podman-image-inspect.1.gz
 share/man/man1/podman-image-list.1.gz
 share/man/man1/podman-image-load.1.gz
 share/man/man1/podman-image-ls.1.gz
 share/man/man1/podman-image-mount.1.gz
 share/man/man1/podman-image-prune.1.gz
 share/man/man1/podman-image-pull.1.gz
 share/man/man1/podman-image-push.1.gz
 share/man/man1/podman-image-rm.1.gz
 share/man/man1/podman-image-save.1.gz
 share/man/man1/podman-image-scp.1.gz
 share/man/man1/podman-image-search.1.gz
 share/man/man1/podman-image-sign.1.gz
 share/man/man1/podman-image-tag.1.gz
 share/man/man1/podman-image-tree.1.gz
 share/man/man1/podman-image-trust.1.gz
 share/man/man1/podman-image-umount.1.gz
 share/man/man1/podman-image-unmount.1.gz
 share/man/man1/podman-image-untag.1.gz
 share/man/man1/podman-image.1.gz
 share/man/man1/podman-images.1.gz
 share/man/man1/podman-import.1.gz
 share/man/man1/podman-info.1.gz
 share/man/man1/podman-init.1.gz
 share/man/man1/podman-inspect.1.gz
 share/man/man1/podman-kill.1.gz
 share/man/man1/podman-kube-apply.1.gz
 share/man/man1/podman-kube-down.1.gz
 share/man/man1/podman-kube-generate.1.gz
 share/man/man1/podman-kube-play.1.gz
 share/man/man1/podman-kube.1.gz
 share/man/man1/podman-load.1.gz
 share/man/man1/podman-login.1.gz
 share/man/man1/podman-logout.1.gz
 share/man/man1/podman-logs.1.gz
+share/man/man1/podman-machine-cp.1.gz
 share/man/man1/podman-machine-info.1.gz
 share/man/man1/podman-machine-init.1.gz
 share/man/man1/podman-machine-inspect.1.gz
 share/man/man1/podman-machine-list.1.gz
 share/man/man1/podman-machine-ls.1.gz
 share/man/man1/podman-machine-os-apply.1.gz
 share/man/man1/podman-machine-os.1.gz
 share/man/man1/podman-machine-reset.1.gz
 share/man/man1/podman-machine-rm.1.gz
 share/man/man1/podman-machine-set.1.gz
 share/man/man1/podman-machine-ssh.1.gz
 share/man/man1/podman-machine-start.1.gz
 share/man/man1/podman-machine-stop.1.gz
 share/man/man1/podman-machine.1.gz
 share/man/man1/podman-manifest-add.1.gz
 share/man/man1/podman-manifest-annotate.1.gz
 share/man/man1/podman-manifest-create.1.gz
 share/man/man1/podman-manifest-exists.1.gz
 share/man/man1/podman-manifest-inspect.1.gz
 share/man/man1/podman-manifest-push.1.gz
 share/man/man1/podman-manifest-remove.1.gz
 share/man/man1/podman-manifest-rm.1.gz
 share/man/man1/podman-manifest.1.gz
 share/man/man1/podman-mount.1.gz
 share/man/man1/podman-network-connect.1.gz
 share/man/man1/podman-network-create.1.gz
 share/man/man1/podman-network-disconnect.1.gz
 share/man/man1/podman-network-exists.1.gz
 share/man/man1/podman-network-inspect.1.gz
 share/man/man1/podman-network-ls.1.gz
 share/man/man1/podman-network-prune.1.gz
 share/man/man1/podman-network-reload.1.gz
 share/man/man1/podman-network-rm.1.gz
 share/man/man1/podman-network-update.1.gz
 share/man/man1/podman-network.1.gz
 share/man/man1/podman-pause.1.gz
 share/man/man1/podman-play-kube.1.gz
 share/man/man1/podman-pod-clone.1.gz
 share/man/man1/podman-pod-create.1.gz
 share/man/man1/podman-pod-exists.1.gz
 share/man/man1/podman-pod-inspect.1.gz
 share/man/man1/podman-pod-kill.1.gz
 share/man/man1/podman-pod-logs.1.gz
 share/man/man1/podman-pod-pause.1.gz
 share/man/man1/podman-pod-prune.1.gz
 share/man/man1/podman-pod-ps.1.gz
 share/man/man1/podman-pod-restart.1.gz
 share/man/man1/podman-pod-rm.1.gz
 share/man/man1/podman-pod-start.1.gz
 share/man/man1/podman-pod-stats.1.gz
 share/man/man1/podman-pod-stop.1.gz
 share/man/man1/podman-pod-top.1.gz
 share/man/man1/podman-pod-unpause.1.gz
 share/man/man1/podman-pod.1.gz
 share/man/man1/podman-port.1.gz
 share/man/man1/podman-ps.1.gz
 share/man/man1/podman-pull.1.gz
 share/man/man1/podman-push.1.gz
 share/man/man1/podman-remote.1.gz
 share/man/man1/podman-rename.1.gz
 share/man/man1/podman-restart.1.gz
 share/man/man1/podman-rm.1.gz
 share/man/man1/podman-rmi.1.gz
 share/man/man1/podman-run.1.gz
 share/man/man1/podman-save.1.gz
 share/man/man1/podman-search.1.gz
 share/man/man1/podman-secret-create.1.gz
 share/man/man1/podman-secret-exists.1.gz
 share/man/man1/podman-secret-inspect.1.gz
 share/man/man1/podman-secret-ls.1.gz
 share/man/man1/podman-secret-rm.1.gz
 share/man/man1/podman-secret.1.gz
 share/man/man1/podman-start.1.gz
 share/man/man1/podman-stats.1.gz
 share/man/man1/podman-stop.1.gz
 share/man/man1/podman-system-check.1.gz
 share/man/man1/podman-system-connection-add.1.gz
 share/man/man1/podman-system-connection-default.1.gz
 share/man/man1/podman-system-connection-list.1.gz
 share/man/man1/podman-system-connection-remove.1.gz
 share/man/man1/podman-system-connection-rename.1.gz
 share/man/man1/podman-system-connection.1.gz
 share/man/man1/podman-system-df.1.gz
 share/man/man1/podman-system-events.1.gz
 share/man/man1/podman-system-info.1.gz
 share/man/man1/podman-system-migrate.1.gz
 share/man/man1/podman-system-prune.1.gz
 share/man/man1/podman-system-renumber.1.gz
 share/man/man1/podman-system-reset.1.gz
 share/man/man1/podman-system-service.1.gz
 share/man/man1/podman-system.1.gz
 share/man/man1/podman-tag.1.gz
 share/man/man1/podman-top.1.gz
 share/man/man1/podman-umount.1.gz
 share/man/man1/podman-unmount.1.gz
 share/man/man1/podman-unpause.1.gz
 share/man/man1/podman-unshare.1.gz
 share/man/man1/podman-untag.1.gz
 share/man/man1/podman-update.1.gz
 share/man/man1/podman-version.1.gz
 share/man/man1/podman-volume-create.1.gz
 share/man/man1/podman-volume-exists.1.gz
 share/man/man1/podman-volume-export.1.gz
 share/man/man1/podman-volume-import.1.gz
 share/man/man1/podman-volume-inspect.1.gz
 share/man/man1/podman-volume-ls.1.gz
 share/man/man1/podman-volume-mount.1.gz
 share/man/man1/podman-volume-prune.1.gz
 share/man/man1/podman-volume-reload.1.gz
 share/man/man1/podman-volume-rm.1.gz
 share/man/man1/podman-volume-unmount.1.gz
 share/man/man1/podman-volume.1.gz
 share/man/man1/podman-wait.1.gz
 share/man/man1/podman.1.gz
 share/man/man1/podmansh.1.gz
 share/man/man5/podman-systemd.unit.5.gz
 share/man/man5/quadlet.5.gz
 share/man/man7/podman-rootless.7.gz
 share/man/man7/podman-troubleshooting.7.gz
 share/zsh/site-functions/_podman
 share/zsh/site-functions/_podman-remote
 @dir libexec/podman
diff --git a/sysutils/skopeo/Makefile b/sysutils/skopeo/Makefile
index 8385b41c2286..8d380f917e93 100644
--- a/sysutils/skopeo/Makefile
+++ b/sysutils/skopeo/Makefile
@@ -1,31 +1,30 @@
 PORTNAME=	skopeo
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.17.0
-PORTREVISION=	3
+DISTVERSION=	1.19.0
 CATEGORIES=	sysutils
 
 MAINTAINER=	dfr@FreeBSD.org
 COMMENT=	Inspect container images and repositories on registries
 WWW=		https://github.com/containers/skopeo
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	bash:shells/bash \
 		curl:ftp/curl \
 		go-md2man:textproc/go-md2man
 LIB_DEPENDS=	libgpgme.so:security/gpgme
 RUN_DEPENDS=	${LOCALBASE}/etc/containers/containers.conf.sample:sysutils/containers-common
 
-USES=		gmake go:modules,no_targets,1.22 pkgconfig
+USES=		gmake go:modules,no_targets,1.23 pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	containers
 
 do-install:
 	${SETENV} ${MAKE_ENV} ${GO_ENV} ${GMAKE} -C ${WRKSRC} \
 		DESTDIR=${STAGEDIR} GOCACHE=${TMPDIR} \
 		GO=${GO_CMD} install-binary install-docs install-completions
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/containers/registries.d
 	${INSTALL_DATA} ${WRKSRC}/default.yaml ${STAGEDIR}${PREFIX}/etc/containers/registries.d/default.yaml
 
 .include <bsd.port.mk>
diff --git a/sysutils/skopeo/distinfo b/sysutils/skopeo/distinfo
index 9d4508ce79a5..25eb3e5a86f1 100644
--- a/sysutils/skopeo/distinfo
+++ b/sysutils/skopeo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738598110
-SHA256 (containers-skopeo-v1.17.0_GH0.tar.gz) = e548c044c7b644ba455f482df387ec90aceea432b9c61a0bab0ec8534970eb69
-SIZE (containers-skopeo-v1.17.0_GH0.tar.gz) = 10682765
+TIMESTAMP = 1750104581
+SHA256 (containers-skopeo-v1.19.0_GH0.tar.gz) = 043e9f568440accf1aafca122a25c4d21441f16de49475192ec4abeef7430358
+SIZE (containers-skopeo-v1.19.0_GH0.tar.gz) = 10819827
diff --git a/sysutils/skopeo/files/patch-vendor_github.com_containers_storage_pkg_chunked_storage__unsupported.go b/sysutils/skopeo/files/patch-vendor_github.com_containers_storage_pkg_chunked_storage__unsupported.go
deleted file mode 100644
index d17e29d695ee..000000000000
--- a/sysutils/skopeo/files/patch-vendor_github.com_containers_storage_pkg_chunked_storage__unsupported.go
+++ /dev/null
@@ -1,9 +0,0 @@
---- vendor/github.com/containers/storage/pkg/chunked/storage_unsupported.go.orig	2025-02-04 11:32:21 UTC
-+++ vendor/github.com/containers/storage/pkg/chunked/storage_unsupported.go
-@@ -13,5 +13,5 @@ func GetDiffer(ctx context.Context, store storage.Stor
- 
- // GetDiffer returns a differ than can be used with ApplyDiffWithDiffer.
- func GetDiffer(ctx context.Context, store storage.Store, blobDigest digest.Digest, blobSize int64, annotations map[string]string, iss ImageSourceSeekable) (graphdriver.Differ, error) {
--	return nil, errors.New("format not supported on this system")
-+	return nil, newErrFallbackToOrdinaryLayerDownload(errors.New("format not supported on this system"))
- }