git: f20f7fe23fae - main - ports-mgmt/pkg_jail: Update to 2.17

The branch main has been updated by dinoex:

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

commit f20f7fe23fae6d90d24f69f735261001c8aaff89
Author:     Dirk Meyer <dinoex@FreeBSD.org>
AuthorDate: 2026-06-22 11:18:56 +0000
Commit:     Dirk Meyer <dinoex@FreeBSD.org>
CommitDate: 2026-06-22 11:18:56 +0000

    ports-mgmt/pkg_jail: Update to 2.17
---
 ports-mgmt/pkg_jail/Makefile  | 6 +++---
 ports-mgmt/pkg_jail/distinfo  | 6 +++---
 ports-mgmt/pkg_jail/pkg-plist | 2 ++
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ports-mgmt/pkg_jail/Makefile b/ports-mgmt/pkg_jail/Makefile
index 5e48430d1dec..5a51d7585cd9 100644
--- a/ports-mgmt/pkg_jail/Makefile
+++ b/ports-mgmt/pkg_jail/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	pkg_jail
-PORTVERSION=	2.16
+PORTVERSION=	2.17
 DISTVERSIONPREFIX=	v
 CATEGORIES=	ports-mgmt
 
@@ -16,14 +16,14 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	dinoex
 
 LMAN1=		allservice.1 check-allservice.1 pkg_jail.1 pkg_update.1
-LMAN8=		make-base.8 update-base.8 update-pkg.8
+LMAN8=		make-base.8 mergemaster.8 update-base.8 update-pkg.8
 
 do-install:
 	( cd ${WRKSRC} && \
 	${INSTALL_SCRIPT} allservice check-allservice pkg_jail pkg_update \
 		${STAGEDIR}${PREFIX}/bin/ )
 	( cd ${WRKSRC} && \
-	${INSTALL_SCRIPT} make-base update-base update-pkg \
+	${INSTALL_SCRIPT} make-base mergemaster update-base update-pkg \
 		${STAGEDIR}${PREFIX}/sbin/ )
 .for i in ${LMAN1}
 	${INSTALL_MAN} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/share/man/man1/
diff --git a/ports-mgmt/pkg_jail/distinfo b/ports-mgmt/pkg_jail/distinfo
index a5c8463ae6cc..f11d8da6c6bc 100644
--- a/ports-mgmt/pkg_jail/distinfo
+++ b/ports-mgmt/pkg_jail/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1773578893
-SHA256 (dinoex-pkg_jail-v2.16_GH0.tar.gz) = e81c6e0efefec188c1253da6d8d29d964f9c0167044da50da0d47c287dd8f015
-SIZE (dinoex-pkg_jail-v2.16_GH0.tar.gz) = 19110
+TIMESTAMP = 1782126711
+SHA256 (dinoex-pkg_jail-v2.17_GH0.tar.gz) = c7cebfdc2be5f5613dc61320888d97e56b6e1f9310e074e25303f3472406e1a7
+SIZE (dinoex-pkg_jail-v2.17_GH0.tar.gz) = 35341
diff --git a/ports-mgmt/pkg_jail/pkg-plist b/ports-mgmt/pkg_jail/pkg-plist
index 2adad106ced8..3860628c5979 100644
--- a/ports-mgmt/pkg_jail/pkg-plist
+++ b/ports-mgmt/pkg_jail/pkg-plist
@@ -3,6 +3,7 @@ bin/check-allservice
 bin/pkg_jail
 bin/pkg_update
 sbin/make-base
+sbin/mergemaster
 sbin/update-base
 sbin/update-pkg
 share/man/man1/allservice.1.gz
@@ -10,5 +11,6 @@ share/man/man1/check-allservice.1.gz
 share/man/man1/pkg_jail.1.gz
 share/man/man1/pkg_update.1.gz
 share/man/man8/make-base.8.gz
+share/man/man8/mergemaster.8.gz
 share/man/man8/update-base.8.gz
 share/man/man8/update-pkg.8.gz