git: c86c52c862a4 - main - ports-mgmt/pkg: update to 1.18.0

The branch main has been updated by bapt:

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

commit c86c52c862a4f3d5b785524647e1c752097c3d30
Author:     Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2022-06-23 07:47:09 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2022-06-23 07:48:33 +0000

    ports-mgmt/pkg: update to 1.18.0
    
    Changes:
    - add support for category and flavor in  all queries (<category>/<portname>[@<flavor>]
    - new tcp protocol to support inetd/spiped
    - end of ftp support
    - allow filtering out files at install time
    - improvements on triggers
    - plenty of bug and doc fixes
---
 ports-mgmt/pkg/Makefile                       |  3 +--
 ports-mgmt/pkg/distinfo                       |  6 +++---
 ports-mgmt/pkg/files/patch-libpkg_pkg__jobs.c | 11 -----------
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile
index b031f2ebbe35..037e65f11806 100644
--- a/ports-mgmt/pkg/Makefile
+++ b/ports-mgmt/pkg/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	pkg
-DISTVERSION=	1.17.5
-PORTREVISION=	1
+DISTVERSION=	1.18.0
 _PKG_VERSION=	${DISTVERSION}
 CATEGORIES=	ports-mgmt
 #MASTER_SITES=	\
diff --git a/ports-mgmt/pkg/distinfo b/ports-mgmt/pkg/distinfo
index 0e828a5b79a8..7e51f2e264df 100644
--- a/ports-mgmt/pkg/distinfo
+++ b/ports-mgmt/pkg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1636711882
-SHA256 (freebsd-pkg-1.17.5_GH0.tar.gz) = 4ee22102c136898ec19e6359079a492dc898309bc284dd26e9ec9f5d8b5bae77
-SIZE (freebsd-pkg-1.17.5_GH0.tar.gz) = 3898974
+TIMESTAMP = 1655968889
+SHA256 (freebsd-pkg-1.18.0_GH0.tar.gz) = 69fa7e536b5f86878acc4521ab6560afaa919055c6f56809986abb5740833e09
+SIZE (freebsd-pkg-1.18.0_GH0.tar.gz) = 4019915
diff --git a/ports-mgmt/pkg/files/patch-libpkg_pkg__jobs.c b/ports-mgmt/pkg/files/patch-libpkg_pkg__jobs.c
deleted file mode 100644
index 7d54afff36e2..000000000000
--- a/ports-mgmt/pkg/files/patch-libpkg_pkg__jobs.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libpkg/pkg_jobs.c.orig	2019-09-18 07:11:10 UTC
-+++ libpkg/pkg_jobs.c
-@@ -74,7 +74,7 @@ struct pkg_jobs_locked {
- 	int (*locked_pkg_cb)(struct pkg *, void *);
- 	void *context;
- };
--static __thread struct pkg_jobs_locked *pkgs_job_lockedpkg;
-+static struct pkg_jobs_locked *pkgs_job_lockedpkg;
- 
- #define IS_DELETE(j) ((j)->type == PKG_JOBS_DEINSTALL || (j)->type == PKG_JOBS_AUTOREMOVE)
-