git: bca999a5758a - main - mail/cyrus-imapd310: fix 'pkg -r' install

The branch main has been updated by ume:

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

commit bca999a5758a44b12fdc9e28c097a6a3451ab4a8
Author:     Hajimu UMEMOTO <ume@FreeBSD.org>
AuthorDate: 2025-02-14 17:06:42 +0000
Commit:     Hajimu UMEMOTO <ume@FreeBSD.org>
CommitDate: 2025-02-14 17:06:42 +0000

    mail/cyrus-imapd310: fix 'pkg -r' install
    
    PR:             281294
    Reported by:    Siva Mahadevan <me@svmhdvn.name>
---
 mail/cyrus-imapd310/Makefile               | 2 +-
 mail/cyrus-imapd310/files/pkg-deinstall.in | 6 +++---
 mail/cyrus-imapd310/files/pkg-install.in   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mail/cyrus-imapd310/Makefile b/mail/cyrus-imapd310/Makefile
index eef17d7c6d09..d3a63538dcf5 100644
--- a/mail/cyrus-imapd310/Makefile
+++ b/mail/cyrus-imapd310/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	cyrus-imapd
 DISTVERSION=	3.10.1
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${DISTVERSION}/
 PKGNAMESUFFIX=	${CYRUS_IMAPD_VER}
diff --git a/mail/cyrus-imapd310/files/pkg-deinstall.in b/mail/cyrus-imapd310/files/pkg-deinstall.in
index e56484fd6b2b..2e933163aba4 100644
--- a/mail/cyrus-imapd310/files/pkg-deinstall.in
+++ b/mail/cyrus-imapd310/files/pkg-deinstall.in
@@ -14,16 +14,16 @@ CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%}
 modify_cyrus_user() {
 	USER=${CYRUS_USER}
 	PW=/usr/sbin/pw
-	if [ -x /usr/sbin/nologin ]; then
+	if [ -x "${PKG_ROOTDIR}/usr/sbin/nologin" ]; then
 		shell=/usr/sbin/nologin
-	elif [ -x /sbin/nologin ]; then
+	elif [ -x "${PKG_ROOTDIR}/sbin/nologin" ]; then
 		shell=/sbin/nologin
 	else
 		shell=/nonexistent
 	fi
 	uhome=/nonexistent
 
-	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
+	if ! ${PW} -R "${PKG_ROOTDIR}" mod user ${USER} -d "${uhome}" -s "${shell}"; then
 		echo "*** Failed to update user \`${USER}'."
 	else
 		echo "*** Updated user \`${USER}'."
diff --git a/mail/cyrus-imapd310/files/pkg-install.in b/mail/cyrus-imapd310/files/pkg-install.in
index c806a61ad6cc..2b7e9053c677 100644
--- a/mail/cyrus-imapd310/files/pkg-install.in
+++ b/mail/cyrus-imapd310/files/pkg-install.in
@@ -16,7 +16,7 @@ modify_cyrus_user() {
 	shell=/bin/csh
 	uhome=${PKG_PREFIX}/cyrus
 
-	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
+	if ! ${PW} -R "${PKG_ROOTDIR}" mod user ${USER} -d "${uhome}" -s "${shell}"; then
 		echo "*** Failed to update user \`${USER}'."
 	else
 		echo "*** Updated user \`${USER}'."