git: 2faaf242638c - main - sysutils/screen*: Work around hardstatus regression

From: Cy Schubert <cy_at_FreeBSD.org>
Date: Mon, 26 May 2025 15:01:02 UTC
The branch main has been updated by cy:

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

commit 2faaf242638cb6258789520d77ecae5d82227358
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2025-05-26 14:58:36 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2025-05-26 15:00:57 +0000

    sysutils/screen*: Work around hardstatus regression
    
    The workaround provided by the submittor works better than the hardstatus
    line provided by upstream.
    
    PR:             287045
---
 sysutils/screen-devel/Makefile              | 1 +
 sysutils/screen-devel/files/screenrc.sample | 2 +-
 sysutils/screen50/Makefile                  | 2 +-
 sysutils/screen50/files/screenrc.sample     | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/sysutils/screen-devel/Makefile b/sysutils/screen-devel/Makefile
index 924088d23035..da6903deec5d 100644
--- a/sysutils/screen-devel/Makefile
+++ b/sysutils/screen-devel/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	screen
 DISTVERSION=	5.0.1.${SCREEN_COMMIT_DATE}
+PORTREVISION=	1
 CATEGORIES=	sysutils
 PKGNAMESUFFIX=	-devel
 MASTER_SITES=	#
diff --git a/sysutils/screen-devel/files/screenrc.sample b/sysutils/screen-devel/files/screenrc.sample
index 3762f6c5da7b..8bfb5906d20c 100644
--- a/sysutils/screen-devel/files/screenrc.sample
+++ b/sysutils/screen-devel/files/screenrc.sample
@@ -3,7 +3,7 @@ defscrollback 5000
 termcapinfo xterm ti@:te@
 termcapinfo xterm-color ti@:te@
 hardstatus alwayslastline
-hardstatus string '%{2;0}[%{+b2}%H%{-}][%= %{7}%?%-Lw%?%{+b1}(%{+b7}%n%f%t%?(%u)%?%{-})%{-}%?%+Lw%?%= %{-}]%{+b6}[%m/%d/%y %c]%{-}%{-}'
+hardstatus string '%{2;0}[%{+b10;0}%H%{-}][%= %{7;0}%?%-Lw%?%{+9;0}(%{+15;0}%n%f %t%?(%u)%?%{-})%{-} ^H%?%+Lw%?%= %{-}]%{+b14;0}[%m/%d/%y %c]%{-}%{-}'
 vbell off
 shell -$SHELL
 logtstamp on
diff --git a/sysutils/screen50/Makefile b/sysutils/screen50/Makefile
index 91dc6157433b..5ea9c2b6b113 100644
--- a/sysutils/screen50/Makefile
+++ b/sysutils/screen50/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	screen
 DISTVERSION=	5.0.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	GNU \
 	        ftp://ftp.gnu.org/gnu/screen/ \
diff --git a/sysutils/screen50/files/screenrc.sample b/sysutils/screen50/files/screenrc.sample
index 3762f6c5da7b..8bfb5906d20c 100644
--- a/sysutils/screen50/files/screenrc.sample
+++ b/sysutils/screen50/files/screenrc.sample
@@ -3,7 +3,7 @@ defscrollback 5000
 termcapinfo xterm ti@:te@
 termcapinfo xterm-color ti@:te@
 hardstatus alwayslastline
-hardstatus string '%{2;0}[%{+b2}%H%{-}][%= %{7}%?%-Lw%?%{+b1}(%{+b7}%n%f%t%?(%u)%?%{-})%{-}%?%+Lw%?%= %{-}]%{+b6}[%m/%d/%y %c]%{-}%{-}'
+hardstatus string '%{2;0}[%{+b10;0}%H%{-}][%= %{7;0}%?%-Lw%?%{+9;0}(%{+15;0}%n%f %t%?(%u)%?%{-})%{-} ^H%?%+Lw%?%= %{-}]%{+b14;0}[%m/%d/%y %c]%{-}%{-}'
 vbell off
 shell -$SHELL
 logtstamp on