git: f6308d120f7c - main - sysutils/containers-common: update: 0.64.2 -> 0.67.2

From: Sergey A. Osokin <osa_at_FreeBSD.org>
Date: Wed, 14 Oct 2026 14:46:41 UTC
The branch main has been updated by osa:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f6308d120f7c12a186288cedbef7284333d368d9

commit f6308d120f7c12a186288cedbef7284333d368d9
Author:     Sergey A. Osokin <osa@FreeBSD.org>
AuthorDate: 2026-10-14 14:32:53 +0000
Commit:     Sergey A. Osokin <osa@FreeBSD.org>
CommitDate: 2026-10-14 14:46:27 +0000

    sysutils/containers-common: update: 0.64.2 -> 0.67.2
    
    The vendor has decided to move common, image, and storage
    distributions under unified umbrella: container-libs.  Also,
    the GitHub project has changed its name from the containers to
    the podman-container-tools.
    
    PR:             299332
    Approved by:    dfr (maintainer)
    
    Sponsored by:   tipi.work
---
 sysutils/containers-common/Makefile | 44 ++++++++++++++++---------------------
 sysutils/containers-common/distinfo | 14 +++++-------
 2 files changed, 24 insertions(+), 34 deletions(-)

diff --git a/sysutils/containers-common/Makefile b/sysutils/containers-common/Makefile
index 852861f07c19..d999a5794311 100644
--- a/sysutils/containers-common/Makefile
+++ b/sysutils/containers-common/Makefile
@@ -1,15 +1,19 @@
-PORTNAME=	containers-common
+PORTNAME=	container-libs-common
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.64.2
-PORTREVISION=	4
+DISTVERSION=	0.67.2
 CATEGORIES=	sysutils
+MASTER_SITES=	https://github.com/podman-container-tools/container-libs/archive/refs/tags/common/v${DISTVERSION}/:libs \
+		https://github.com/podman-container-tools/skopeo/archive/refs/tags/:skopeo
+DISTFILES=	v${DISTVERSION}.tar.gz:libs \
+		v${SKOPEOVERSION}.tar.gz:skopeo
+DIST_SUBDIR=	${PORTNAME}
 
 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
+LICENSE_FILE=	${WRKSRC}/common/LICENSE
 
 BUILD_DEPENDS=	bash:shells/bash \
 		curl:ftp/curl \
@@ -17,44 +21,34 @@ BUILD_DEPENDS=	bash:shells/bash \
 
 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.36.2
-SKOPEOVERSION=	1.22.2
-STORAGEVERSION=	1.59.1
+SKOPEOVERSION=	1.22.3
 
 post-patch:
-	${SED} -I '' /golangci/d ${WRKSRC_storage}/tests/tools/Makefile
-	${SED} -I '' -Ee s/go-md2man../go-md2man/ ${WRKSRC_storage}/tests/tools/Makefile
+	${SED} -I '' /golangci/d ${WRKSRC}/storage/Makefile
+	${SED} -I '' -Ee s/go-md2man../go-md2man/ ${WRKSRC}/storage/Makefile
 
 do-build:
-	${GMAKE} -C ${WRKSRC_common}/docs
-	${GMAKE} -C ${WRKSRC_storage} install.tools
+	${GMAKE} -C ${WRKSRC}/common/docs
 
 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 \
+	${INSTALL_DATA} ${WRKSRC}/image/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 \
+	${INSTALL_DATA} ${WRKSRC}/storage/storage.conf-freebsd \
 		${STAGEDIR}${PREFIX}/etc/containers/storage.conf.sample
-	${INSTALL_DATA} ${WRKSRC_image}/registries.conf \
+	${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 \
+	${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
+	${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 80f59c7db4b1..ede9d42508a4 100644
--- a/sysutils/containers-common/distinfo
+++ b/sysutils/containers-common/distinfo
@@ -1,9 +1,5 @@
-TIMESTAMP = 1776198598
-SHA256 (containers-common-v0.64.2_GH0.tar.gz) = 12fdb97803ee428d6ad66d66c6b582598b23ded4c8476f30dab6b4e9582d4f67
-SIZE (containers-common-v0.64.2_GH0.tar.gz) = 13131015
-SHA256 (containers-image-v5.36.2_GH0.tar.gz) = 2002eac26c5818437a069173ed9b3550655098ce4b08464782a0c2e896c2e41e
-SIZE (containers-image-v5.36.2_GH0.tar.gz) = 764570
-SHA256 (containers-skopeo-v1.22.2_GH0.tar.gz) = b6e1f208c1048f7a80613e8154774e6a3fdc891aeb45325c8ed905be4dee48d8
-SIZE (containers-skopeo-v1.22.2_GH0.tar.gz) = 10327855
-SHA256 (containers-storage-v1.59.1_GH0.tar.gz) = 2d4b0e5f66c83c776c6dab81fd52bee2aac72832ef3af4e6a1e081aaf1f87f30
-SIZE (containers-storage-v1.59.1_GH0.tar.gz) = 4606021
+TIMESTAMP = 1791821437
+SHA256 (container-libs-common/v0.67.2.tar.gz) = f880eec837f497ecc9da95cef3c8cec86c9858b60c932176f07b5e9e1efc8215
+SIZE (container-libs-common/v0.67.2.tar.gz) = 3108388
+SHA256 (container-libs-common/v1.22.3.tar.gz) = f372e8c23407e727d6762d0bd6ff0804fc2180bc8af5c8a134197c756cff2737
+SIZE (container-libs-common/v1.22.3.tar.gz) = 10338736