git: 22a13e4c7763 - main - sysutils/nerdctl: Update to 2.4.0

From: Laurent Chardon <laurent_at_FreeBSD.org>
Date: Tue, 29 Sep 2026 07:10:06 UTC
The branch main has been updated by laurent:

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

commit 22a13e4c7763bb1a4a0535f708b782966d54285b
Author:     Laurent Chardon <laurent@FreeBSD.org>
AuthorDate: 2026-09-29 07:06:44 +0000
Commit:     Laurent Chardon <laurent@FreeBSD.org>
CommitDate: 2026-09-29 07:09:39 +0000

    sysutils/nerdctl: Update to 2.4.0
    
    - Install the upstream NOTICE file
    - Add an EXAMPLES option
    - Stop installing Linux-only rootless helper scripts
    
    Release notes:
    https://github.com/containerd/nerdctl/releases/tag/v2.4.0
    
    Approved by:    thierry (mentor, implicit)
---
 sysutils/nerdctl/Makefile  | 17 ++++++++++-------
 sysutils/nerdctl/distinfo  | 10 +++++-----
 sysutils/nerdctl/pkg-descr |  1 -
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/sysutils/nerdctl/Makefile b/sysutils/nerdctl/Makefile
index e178ea281edb..f0a8fb8f3e52 100644
--- a/sysutils/nerdctl/Makefile
+++ b/sysutils/nerdctl/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	nerdctl
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.3.5
-PORTREVISION=	3
+DISTVERSION=	2.4.0
 CATEGORIES=	sysutils
 DISTFILES+=	go.mod
 
@@ -21,16 +20,16 @@ GO_TARGET=	./cmd/${PORTNAME}
 GO_BUILDFLAGS=	-ldflags "-s -w -X ${GO_MODULE}/pkg/version.Version=${DISTVERSIONFULL}"
 GO_TESTTARGET=	./pkg/...
 
-PLIST_FILES=	bin/containerd-rootless-setuptool.sh \
-		bin/containerd-rootless.sh \
-		bin/nerdctl \
+PLIST_FILES=	bin/nerdctl \
 		etc/bash_completion.d/${PORTNAME} \
 		share/fish/vendor_completions.d/${PORTNAME}.fish \
+		share/licenses/${PKGNAME}/NOTICE \
 		share/zsh/site-functions/_${PORTNAME}
 
 PORTDOCS=	*
+PORTEXAMPLES=	*
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 pre-fetch:
 	@${MKDIR} ${DISTDIR}/${DIST_SUBDIR}
@@ -41,11 +40,12 @@ pre-fetch:
 		${REINPLACE_CMD} '/tigron/d' ${DISTDIR}/${DIST_SUBDIR}/go.mod)
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/extras/rootless/* ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d \
 		  ${STAGEDIR}${PREFIX}/share/fish/vendor_completions.d \
 		  ${STAGEDIR}${PREFIX}/share/zsh/site-functions \
+		  ${STAGEDIR}${_LICENSE_DIR} \
 		  ${WRKDIR}/tmp
+	${INSTALL_DATA} ${WRKSRC}/NOTICE ${STAGEDIR}${_LICENSE_DIR}
 	${STAGEDIR}${PREFIX}/bin/${PORTNAME} --data-root=${WRKDIR}/tmp completion bash \
 		> ${STAGEDIR}${PREFIX}/etc/bash_completion.d/${PORTNAME}
 	${STAGEDIR}${PREFIX}/bin/${PORTNAME} --data-root=${WRKDIR}/tmp completion fish \
@@ -56,4 +56,7 @@ post-install:
 post-install-DOCS-on:
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} "README.md docs" ${STAGEDIR}${DOCSDIR})
 
+post-install-EXAMPLES-on:
+	(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
+
 .include <bsd.port.mk>
diff --git a/sysutils/nerdctl/distinfo b/sysutils/nerdctl/distinfo
index ef007b21b0f9..19dcdbf1aea3 100644
--- a/sysutils/nerdctl/distinfo
+++ b/sysutils/nerdctl/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1784628828
-SHA256 (go/sysutils_nerdctl/containerd-nerdctl-v2.3.5_GH0/go.mod) = a8c8ae6fb383f006b5b158295cd279ac8a7caf36a80f2e3169dad06c1d5bae50
-SIZE (go/sysutils_nerdctl/containerd-nerdctl-v2.3.5_GH0/go.mod) = 7481
-SHA256 (go/sysutils_nerdctl/containerd-nerdctl-v2.3.5_GH0/containerd-nerdctl-v2.3.5_GH0.tar.gz) = a225dd180925b33e0c60f3e50948d2da17d784515c345e6bbbc640afcb37519d
-SIZE (go/sysutils_nerdctl/containerd-nerdctl-v2.3.5_GH0/containerd-nerdctl-v2.3.5_GH0.tar.gz) = 1558562
+TIMESTAMP = 1790664382
+SHA256 (go/sysutils_nerdctl/containerd-nerdctl-v2.4.0_GH0/go.mod) = 0806771e625b7ebb416947aecfe19627ebc4d8ac4091a7149df9c660b28c5024
+SIZE (go/sysutils_nerdctl/containerd-nerdctl-v2.4.0_GH0/go.mod) = 8296
+SHA256 (go/sysutils_nerdctl/containerd-nerdctl-v2.4.0_GH0/containerd-nerdctl-v2.4.0_GH0.tar.gz) = 846a6b29ec3d15401e145dc2e3ba58259639ee0af013a7944607b829ccb62916
+SIZE (go/sysutils_nerdctl/containerd-nerdctl-v2.4.0_GH0/containerd-nerdctl-v2.4.0_GH0.tar.gz) = 1670651
diff --git a/sysutils/nerdctl/pkg-descr b/sysutils/nerdctl/pkg-descr
index 424ec812ace3..b84a12085ce1 100644
--- a/sysutils/nerdctl/pkg-descr
+++ b/sysutils/nerdctl/pkg-descr
@@ -1,7 +1,6 @@
 ContaiNERD CTL - Docker-compatible CLI for containerd
 - Same UI/UX as docker
 - Supports Docker Compose (nerdctl compose up)
-- [Optional] Supports rootless mode, without slirp overhead (bypass4netns)
 - [Optional] Supports lazy-pulling (Stargz, Nydus, OverlayBD)
 - [Optional] Supports encrypted images (ocicrypt)
 - [Optional] Supports P2P image distribution (IPFS)