Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 29 Mar 2022 17:06:36 GMT
From:      Cy Schubert <cy@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 36f516ad2ae4 - main - sysutils/screen: Fix plist
Message-ID:  <202203291706.22TH6aKt067290@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by cy:

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

commit 36f516ad2ae4fe01c51f8055c87491d0dd2605e9
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2022-03-29 17:03:35 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2022-03-29 17:06:34 +0000

    sysutils/screen: Fix plist
    
    PLIST doesn't like "_" in variable names. Fix by renaming
    MULTIUSER_SCREEN to MULTIUSER.
    
    PR:             262903
    Reported by:    sunpoet, Michael Butler <imb@protected-networks.net>
    Fixes:          8f528507e9ca
    Pointy hat to:  cy
---
 sysutils/screen/Makefile  | 4 ++--
 sysutils/screen/pkg-plist | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sysutils/screen/Makefile b/sysutils/screen/Makefile
index 664bc585e091..9cbb1c74af4d 100644
--- a/sysutils/screen/Makefile
+++ b/sysutils/screen/Makefile
@@ -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_SCREEN="@(,,4755) "
-MULTUSER_PLIST_SUB_OFF=	MULTIUSER_SCREEN="@(,,0755) "
+MULTIUSER_PLIST_SUB=	MULTIUSER="@(,,4755) "
+MULTUSER_PLIST_SUB_OFF=	MULTIUSER="@(,,0755) "
 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 e1afe2d637e4..9d8d35c8a19e 100644
--- a/sysutils/screen/pkg-plist
+++ b/sysutils/screen/pkg-plist
@@ -1,5 +1,5 @@
 bin/screen
-%%MULTIUSER_SCREEN%%bin/screen-4.9.0
+%%MULTIUSER%%bin/screen-4.9.0
 man/man1/screen.1.gz
 %%DATADIR%%/utf8encodings/01
 %%DATADIR%%/utf8encodings/02



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202203291706.22TH6aKt067290>