git: 61ebb668c105 - main - sysutils/screen: Varioius fixups

From: Cy Schubert <cy_at_FreeBSD.org>
Date: Tue, 29 Mar 2022 22:13:18 UTC
The branch main has been updated by cy:

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

commit 61ebb668c105081e004d2d742d7051133001977f
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2022-03-29 22:06:20 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2022-03-29 22:13:14 +0000

    sysutils/screen: Varioius fixups
    
    Make interprets PLIST variable names too. Choose a variable name
    different enough not to be interpreted by make.
    
    Fix a typo.
    
    Use default executable permissions of 555, same as if permissions
    weren't set in the first place. We're only interested in the setuid
    bit. This requries a PORTREVISION bump.
---
 sysutils/screen/Makefile  | 6 +++---
 sysutils/screen/pkg-plist | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sysutils/screen/Makefile b/sysutils/screen/Makefile
index 9cbb1c74af4d..a5b9136a910e 100644
--- a/sysutils/screen/Makefile
+++ b/sysutils/screen/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	screen
 PORTVERSION=	4.9.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	GNU \
 		ftp://ftp.gnu.org/gnu/screen/ \
@@ -30,8 +30,8 @@ SOCKETS_DESC=		Use new (4.2.1+) sockets for IPC (default)
 NAMED_PIPES_DESC=	Use legacy (4.0.3) named pipes for IPC (override)
 SYSTEM_SCREENRC_DESC=	Install system screenrc with helpful status line
 MULTIUSER_DESC=		Install setuid-root screen to support multiuser
-MULTIUSER_PLIST_SUB=	MULTIUSER="@(,,4755) "
-MULTUSER_PLIST_SUB_OFF=	MULTIUSER="@(,,0755) "
+MULTIUSER_PLIST_SUB=	MULTISUID="@(,,4555) "
+MULTIUSER_PLIST_SUB_OFF=MULTISUID="@(,,0555) "
 NCURSES_DEFAULT_DESC=	Depend on ncurses (ports if installed, otherwise base)
 NCURSES_BASE_DESC=	Depend on ncurses in base
 NCURSES_PORT_DESC=	Depend on devel/ncurses in ports
diff --git a/sysutils/screen/pkg-plist b/sysutils/screen/pkg-plist
index 9d8d35c8a19e..e03f87d0ccc1 100644
--- a/sysutils/screen/pkg-plist
+++ b/sysutils/screen/pkg-plist
@@ -1,5 +1,5 @@
 bin/screen
-%%MULTIUSER%%bin/screen-4.9.0
+%%MULTISUID%%bin/screen-4.9.0
 man/man1/screen.1.gz
 %%DATADIR%%/utf8encodings/01
 %%DATADIR%%/utf8encodings/02