sysutils/docker-cli: Renamed from sysutils/docker and update to 29.4.2

Take maintainership.

Sponsored by:	The FreeBSD Foundation
Pull Request:	https://github.com/freebsd/freebsd-ports/pull/513

19 files changed, 59 insertions, 143 deletions

diff --git a/MOVED b/MOVED
index 784619c6940f..3cf38ed4e198 100644
--- a/MOVED
+++ b/MOVED
@@ -5351,3 +5351,4 @@ graphics/libosmesa||2026-06-15|EOLed upstream
 graphics/mesa-gallium-xa||2026-06-15|EOLed upstream
 lang/clover||2026-06-15|EOLed upstream
 java/aparapi||2026-06-15|Has expired: no maintainer, no users in the ports tree, java 8 only, last upstream commit was 10 years ago
+sysutils/docker|sysutils/docker-cli|2026-06-18|Reflect its actual content
diff --git a/sysutils/Makefile b/sysutils/Makefile
index 57f2091c0f92..91291b61a8af 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -308,7 +308,7 @@
     SUBDIR += dmg2img
     SUBDIR += dmidecode
     SUBDIR += dnf
-    SUBDIR += docker
+    SUBDIR += docker-cli
     SUBDIR += docker-compose
     SUBDIR += docker-credential-pass
     SUBDIR += docker-machine
diff --git a/sysutils/docker-cli/Makefile b/sysutils/docker-cli/Makefile
new file mode 100644
index 000000000000..a304c11b1f40
--- /dev/null
+++ b/sysutils/docker-cli/Makefile
@@ -0,0 +1,30 @@
+PORTNAME=	docker-cli
+DISTVERSIONPREFIX=	v
+DISTVERSION=	29.4.2
+CATEGORIES=	sysutils
+
+MAINTAINER=	leafoliage@FreeBSD.org
+COMMENT=	Open-source application container engine
+WWW=		https://www.docker.com/
+
+LICENSE=	APACHE20
+
+USES=		cpe go
+USE_GITHUB=	yes
+GH_ACCOUNT=	docker
+GH_PROJECT=	cli
+
+GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
+GO_TARGET=	${GO_PKGNAME}/cmd/docker
+#TAG_HASH!=	fetch -qo - https://api.github.com/repos/docker/cli/git/ref/tags/${DISTVERSIONPREFIX}${PORTVERSION} | grep -oE '"[a-f0-9]*"' | cut -c 2-41
+#COMMIT_HASH!=	fetch -qo - https://api.github.com/repos/docker/cli/git/tags/${TAG_HASH} | grep -oE '"object":\{"sha":"[a-f0-9]*"' | grep -oE '"[a-f0-9]*"' | cut -c 2-8
+COMMIT_HASH=	055a478
+GO_BUILDFLAGS=	-ldflags "\
+		-X github.com/docker/cli/cli/version.Version=${PORTVERSION} \
+		-X github.com/docker/cli/cli/version.GitCommit=${COMMIT_HASH}"
+
+CONFLICTS_INSTALL=	docker-tray # bin/docker
+
+PLIST_FILES=	bin/docker
+
+.include <bsd.port.mk>
diff --git a/sysutils/docker-cli/distinfo b/sysutils/docker-cli/distinfo
new file mode 100644
index 000000000000..7245529e3977
--- /dev/null
+++ b/sysutils/docker-cli/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1778076574
+SHA256 (docker-cli-v29.4.2_GH0.tar.gz) = 87d5f01a880bdd329af5fb57120b83b7e3bd215d8046b67a0b6d303293e91a1f
+SIZE (docker-cli-v29.4.2_GH0.tar.gz) = 7052248
diff --git a/sysutils/docker-cli/files/patch-cli_config_credentials_default__store__freebsd.go b/sysutils/docker-cli/files/patch-cli_config_credentials_default__store__freebsd.go
new file mode 100644
index 000000000000..aa4f8cc91737
--- /dev/null
+++ b/sysutils/docker-cli/files/patch-cli_config_credentials_default__store__freebsd.go
@@ -0,0 +1,16 @@
+--- /dev/null   2026-05-06 21:47:11.530097000 +0800
++++ cli/config/credentials/default_store_freebsd.go     2026-05-06 21:47:00.912081000 +0800
+@@ -0,0 +1,13 @@
++package credentials
++
++import (
++       "os/exec"
++)
++
++func defaultCredentialsStore() string {
++       if _, err := exec.LookPath("pass"); err == nil {
++               return "pass"
++       }
++
++       return "secretservice"
++}
diff --git a/sysutils/docker-cli/files/patch-cli_config_credentials_default__store__unsupported.go b/sysutils/docker-cli/files/patch-cli_config_credentials_default__store__unsupported.go
new file mode 100644
index 000000000000..635079ddc212
--- /dev/null
+++ b/sysutils/docker-cli/files/patch-cli_config_credentials_default__store__unsupported.go
@@ -0,0 +1,8 @@
+--- cli/config/credentials/default_store_unsupported.go.orig	2026-05-06 21:53:08.203888000 +0800
++++ cli/config/credentials/default_store_unsupported.go	2026-05-06 21:53:28.419333000 +0800
+@@ -1,4 +1,4 @@
+-//go:build !windows && !darwin && !linux
++//go:build !windows && !darwin && !linux && !freebsd
+ 
+ package credentials
+ 
diff --git a/sysutils/docker/pkg-descr b/sysutils/docker-cli/pkg-descr
index b3d214eebd2a..b3d214eebd2a 100644
--- a/sysutils/docker/pkg-descr
+++ b/sysutils/docker-cli/pkg-descr
diff --git a/sysutils/docker/pkg-message b/sysutils/docker-cli/pkg-message
index ceaa00075c1f..ceaa00075c1f 100644
--- a/sysutils/docker/pkg-message
+++ b/sysutils/docker-cli/pkg-message
diff --git a/sysutils/docker/Makefile b/sysutils/docker/Makefile
deleted file mode 100644
index d4954f081a7b..000000000000
--- a/sysutils/docker/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-PORTNAME=		docker
-PORTVERSION=		18.09.5
-DISTVERSIONPREFIX=	v
-PORTREVISION=	39
-CATEGORIES=		sysutils
-
-MAINTAINER=		ports@FreeBSD.org
-COMMENT=		Open-source application container engine
-WWW=		https://www.docker.com/
-
-LICENSE=		APACHE20
-
-BROKEN_aarch64=		fails to build: golang.org/x/sys/unix/cap_freebsd.go:18:23: undefined: CAP_RIGHTS_VERSION_00
-
-PLIST_FILES=		bin/docker
-
-USE_GITHUB=		yes
-GH_PROJECT=		docker-ce
-
-USES=	cpe go
-
-CONFLICTS_INSTALL=	docker-tray # bin/docker
-
-GO_PKGNAME=	github.com/${PORTNAME}
-GO_TARGET=	${GO_PKGNAME}/cli/cmd/docker
-
-pre-build:
-		@${MV} ${GO_WRKSRC}/components/* ${GO_WRKSRC}/
-		@${CP} ${FILESDIR}/default_store_freebsd.go \
-			${GO_WRKSRC}/cli/cli/config/credentials/
-
-.include <bsd.port.mk>
diff --git a/sysutils/docker/distinfo b/sysutils/docker/distinfo
deleted file mode 100644
index 91492d98afc0..000000000000
--- a/sysutils/docker/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1555548784
-SHA256 (docker-docker-ce-v18.09.5_GH0.tar.gz) = 57f2a5d3374d86a8eb680c91df4351f5cb648351b9b32520c6fd2d66e7e97fd5
-SIZE (docker-docker-ce-v18.09.5_GH0.tar.gz) = 15256899
diff --git a/sysutils/docker/files/default_store_freebsd.go b/sysutils/docker/files/default_store_freebsd.go
deleted file mode 100644
index a9012c6d4a8f..000000000000
--- a/sysutils/docker/files/default_store_freebsd.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package credentials
-
-import (
-	"os/exec"
-)
-
-func defaultCredentialsStore() string {
-	if _, err := exec.LookPath("pass"); err == nil {
-		return "pass"
-	}
-
-	return "secretservice"
-}
diff --git a/sysutils/docker/files/patch-components_cli_cli_config_credentials_default__store__unsupported.go b/sysutils/docker/files/patch-components_cli_cli_config_credentials_default__store__unsupported.go
deleted file mode 100644
index b87e130eaa05..000000000000
--- a/sysutils/docker/files/patch-components_cli_cli_config_credentials_default__store__unsupported.go
+++ /dev/null
@@ -1,8 +0,0 @@
---- components/cli/cli/config/credentials/default_store_unsupported.go.orig	2017-12-27 17:03:35 UTC
-+++ components/cli/cli/config/credentials/default_store_unsupported.go
-@@ -1,4 +1,4 @@
--// +build !windows,!darwin,!linux
-+// +build !windows,!darwin,!linux,!freebsd
- 
- package credentials
- 
diff --git a/sysutils/docker/files/patch-components_cli_vendor_github.com_docker_docker_pkg_archive_archive__unix.go b/sysutils/docker/files/patch-components_cli_vendor_github.com_docker_docker_pkg_archive_archive__unix.go
deleted file mode 100644
index a0b650ce5f9a..000000000000
--- a/sysutils/docker/files/patch-components_cli_vendor_github.com_docker_docker_pkg_archive_archive__unix.go
+++ /dev/null
@@ -1,11 +0,0 @@
---- components/cli/vendor/github.com/docker/docker/pkg/archive/archive_unix.go.orig	2017-12-27 17:03:35 UTC
-+++ components/cli/vendor/github.com/docker/docker/pkg/archive/archive_unix.go
-@@ -62,7 +62,7 @@ func getInodeFromStat(stat interface{}) (inode uint64,
- 	s, ok := stat.(*syscall.Stat_t)
- 
- 	if ok {
--		inode = s.Ino
-+		inode = uint64(s.Ino)
- 	}
- 
- 	return
diff --git a/sysutils/docker/files/patch-components_cli_vendor_github.com_docker_docker_pkg_archive_changes__unix.go b/sysutils/docker/files/patch-components_cli_vendor_github.com_docker_docker_pkg_archive_changes__unix.go
deleted file mode 100644
index 3d33fe9f8952..000000000000
--- a/sysutils/docker/files/patch-components_cli_vendor_github.com_docker_docker_pkg_archive_changes__unix.go
+++ /dev/null
@@ -1,11 +0,0 @@
---- components/cli/vendor/github.com/docker/docker/pkg/archive/changes_unix.go.orig	2017-12-27 17:03:35 UTC
-+++ components/cli/vendor/github.com/docker/docker/pkg/archive/changes_unix.go
-@@ -29,7 +29,7 @@ func (info *FileInfo) isDir() bool {
- }
- 
- func getIno(fi os.FileInfo) uint64 {
--	return fi.Sys().(*syscall.Stat_t).Ino
-+	return uint64(fi.Sys().(*syscall.Stat_t).Ino)
- }
- 
- func hasHardlinks(fi os.FileInfo) bool {
diff --git a/sysutils/docker/files/patch-components_cli_vendor_github.com_docker_docker_pkg_mount_mountinfo__freebsd.go b/sysutils/docker/files/patch-components_cli_vendor_github.com_docker_docker_pkg_mount_mountinfo__freebsd.go
deleted file mode 100644
index 88fb39711f4a..000000000000
--- a/sysutils/docker/files/patch-components_cli_vendor_github.com_docker_docker_pkg_mount_mountinfo__freebsd.go
+++ /dev/null
@@ -1,11 +0,0 @@
---- components/cli/vendor/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go.orig	2018-08-03 16:04:11 UTC
-+++ components/cli/vendor/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go
-@@ -37,7 +37,7 @@ func parseMountTable(filter FilterFunc) 
- 
- 		if filter != nil {
- 			// filter out entries we're not interested in
--			skip, stop = filter(p)
-+			skip, stop = filter(&mountinfo)
- 			if skip {
- 				continue
- 			}
diff --git a/sysutils/docker/files/patch-components_cli_vendor_github.com_tonistiigi_fsutil_chtimes__nolinux.go b/sysutils/docker/files/patch-components_cli_vendor_github.com_tonistiigi_fsutil_chtimes__nolinux.go
deleted file mode 100644
index 2e1e6e0069db..000000000000
--- a/sysutils/docker/files/patch-components_cli_vendor_github.com_tonistiigi_fsutil_chtimes__nolinux.go
+++ /dev/null
@@ -1,8 +0,0 @@
---- components/cli/vendor/github.com/tonistiigi/fsutil/chtimes_nolinux.go.orig	2018-08-03 15:31:57 UTC
-+++ components/cli/vendor/github.com/tonistiigi/fsutil/chtimes_nolinux.go
-@@ -1,4 +1,4 @@
--// +build !linux
-+// +build !linux,!freebsd
- 
- package fsutil
- 
diff --git a/sysutils/docker/files/patch-components_cli_vendor_github.com_tonistiigi_fsutil_diskwriter__freebsd.go b/sysutils/docker/files/patch-components_cli_vendor_github.com_tonistiigi_fsutil_diskwriter__freebsd.go
deleted file mode 100644
index b3ebc38cc7dd..000000000000
--- a/sysutils/docker/files/patch-components_cli_vendor_github.com_tonistiigi_fsutil_diskwriter__freebsd.go
+++ /dev/null
@@ -1,23 +0,0 @@
---- components/cli/vendor/github.com/tonistiigi/fsutil/diskwriter_freebsd.go.orig	2018-01-03 19:54:52 UTC
-+++ components/cli/vendor/github.com/tonistiigi/fsutil/diskwriter_freebsd.go
-@@ -0,0 +1,20 @@
-+// +build freebsd
-+
-+package fsutil
-+
-+import (
-+	"github.com/pkg/errors"
-+	"golang.org/x/sys/unix"
-+)
-+
-+func chtimes(path string, un int64) error {
-+	var utimes [2]unix.Timespec
-+	utimes[0] = unix.NsecToTimespec(un)
-+	utimes[1] = utimes[0]
-+
-+	if err := unix.UtimesNanoAt(unix.AT_FDCWD, path, utimes[0:], unix.AT_SYMLINK_NOFOLLOW); err != nil {
-+		return errors.Wrap(err, "failed call to UtimesNanoAt")
-+	}
-+
-+	return nil
-+}
diff --git a/sysutils/docker/files/patch-components_cli_vendor_github.com_tonistiigi_fsutil_diskwriter__unix.go b/sysutils/docker/files/patch-components_cli_vendor_github.com_tonistiigi_fsutil_diskwriter__unix.go
deleted file mode 100644
index 648a6934a0b1..000000000000
--- a/sysutils/docker/files/patch-components_cli_vendor_github.com_tonistiigi_fsutil_diskwriter__unix.go
+++ /dev/null
@@ -1,11 +0,0 @@
---- components/cli/vendor/github.com/tonistiigi/fsutil/diskwriter_unix.go.orig	2019-03-06 12:30:35 UTC
-+++ components/cli/vendor/github.com/tonistiigi/fsutil/diskwriter_unix.go
-@@ -45,7 +45,7 @@ func handleTarTypeBlockCharFifo(path str
- 		mode |= syscall.S_IFBLK
- 	}
- 
--	if err := syscall.Mknod(path, mode, int(mkdev(stat.Devmajor, stat.Devminor))); err != nil {
-+	if err := syscall.Mknod(path, mode, uint64(mkdev(stat.Devmajor, stat.Devminor))); err != nil {
- 		return err
- 	}
- 	return nil
diff --git a/sysutils/docker/files/patch-components_cli_vendor_github.com_tonistiigi_fsutil_stat__unix.go b/sysutils/docker/files/patch-components_cli_vendor_github.com_tonistiigi_fsutil_stat__unix.go
deleted file mode 100644
index 771db18585a6..000000000000
--- a/sysutils/docker/files/patch-components_cli_vendor_github.com_tonistiigi_fsutil_stat__unix.go
+++ /dev/null
@@ -1,11 +0,0 @@
---- components/cli/vendor/github.com/tonistiigi/fsutil/stat_unix.go.orig	2019-02-01 16:05:34 UTC
-+++ components/cli/vendor/github.com/tonistiigi/fsutil/stat_unix.go
-@@ -45,7 +45,7 @@ func setUnixOpt(fi os.FileInfo, stat *ty
- 			stat.Devminor = int64(minor(uint64(s.Rdev)))
- 		}
- 
--		ino := s.Ino
-+		ino := uint64(s.Ino)
- 		if seenFiles != nil {
- 			if s.Nlink > 1 {
- 				if oldpath, ok := seenFiles[ino]; ok {