git: 28a163275326 - main - sysutils/containerd: Update to 1.6.1

From: Bernhard Froehlich <decke_at_FreeBSD.org>
Date: Sun, 13 Mar 2022 07:09:50 UTC
The branch main has been updated by decke:

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

commit 28a163275326a31d47dad17c623cb8c817bf6334
Author:     Bernhard Froehlich <decke@FreeBSD.org>
AuthorDate: 2022-03-13 07:07:14 +0000
Commit:     Bernhard Froehlich <decke@FreeBSD.org>
CommitDate: 2022-03-13 07:07:14 +0000

    sysutils/containerd: Update to 1.6.1
---
 sysutils/containerd/Makefile             | 4 ++--
 sysutils/containerd/distinfo             | 6 +++---
 sysutils/containerd/files/patch-Makefile | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sysutils/containerd/Makefile b/sysutils/containerd/Makefile
index 18447e47a2ca..3a825f0c6977 100644
--- a/sysutils/containerd/Makefile
+++ b/sysutils/containerd/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	containerd
 DISTVERSIONPREFIX=v
-DISTVERSION=	1.5.9
+DISTVERSION=	1.6.1
 CATEGORIES=	sysutils
 
 MAINTAINER=	decke@FreeBSD.org
@@ -28,6 +28,6 @@ PLIST_FILES=	bin/containerd \
 		bin/ctr
 
 do-install:
-	@(cd ${WRKSRC} && ${SETENV} DESTDIR="${STAGEDIR}${PREFIX}" ${MAKE_CMD} install)
+	@(cd ${WRKSRC} && ${SETENV} DESTDIR="${STAGEDIR}" ${MAKE_CMD} install)
 
 .include <bsd.port.mk>
diff --git a/sysutils/containerd/distinfo b/sysutils/containerd/distinfo
index f10347bc45f4..bdba30268e34 100644
--- a/sysutils/containerd/distinfo
+++ b/sysutils/containerd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1641450184
-SHA256 (containerd-containerd-v1.5.9_GH0.tar.gz) = 40c9767af3e87f2c36adf2f563f0a8374e80b30bd2b7aa80058c85912406cef4
-SIZE (containerd-containerd-v1.5.9_GH0.tar.gz) = 7695248
+TIMESTAMP = 1647089724
+SHA256 (containerd-containerd-v1.6.1_GH0.tar.gz) = 4622540a1a362a009148fafeca2a6d35443da79c2d92263c7a52489779a52bc5
+SIZE (containerd-containerd-v1.6.1_GH0.tar.gz) = 8914779
diff --git a/sysutils/containerd/files/patch-Makefile b/sysutils/containerd/files/patch-Makefile
index b97ef729e828..f2f630dcb479 100644
--- a/sysutils/containerd/files/patch-Makefile
+++ b/sysutils/containerd/files/patch-Makefile
@@ -1,10 +1,10 @@
---- Makefile.orig	2021-05-03 20:52:36 UTC
+--- Makefile.orig	2022-03-02 18:52:57 UTC
 +++ Makefile
-@@ -21,8 +21,8 @@ DESTDIR ?= /usr/local
+@@ -30,8 +30,8 @@ MANDIR        ?= $(DATADIR)/man
  TEST_IMAGE_LIST ?=
  
  # Used to populate variables in version package.
--VERSION=$(shell git describe --match 'v[0-9]*' --dirty='.m' --always)
+-VERSION ?= $(shell git describe --match 'v[0-9]*' --dirty='.m' --always)
 -REVISION=$(shell git rev-parse HEAD)$(shell if ! git diff --no-ext-diff --quiet --exit-code; then echo .m; fi)
 +VERSION?=unknown
 +REVISION?=unknown