From 5f9991a88dfefbd19100cfeb0c3a3987f83d5d5f Mon Sep 17 00:00:00 2001 From: Tijl Coosemans Date: Tue, 5 Mar 2019 17:00:25 +0000 Subject: [PATCH] Fix disabling of xserver screensaver by xdg-screensaver script. Add a newline after the t function in a sed command. FreeBSD sed appears to interpret everything after the t function as a label, including characters that would otherwise have special meaning. PR: 235868 Approved by: maintainer timeout (2 weeks) --- devel/xdg-utils/Makefile | 1 + .../xdg-utils/files/patch-scripts_xdg-screensaver.in | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/devel/xdg-utils/Makefile b/devel/xdg-utils/Makefile index 947e6394a910..116615dba87b 100644 --- a/devel/xdg-utils/Makefile +++ b/devel/xdg-utils/Makefile @@ -3,6 +3,7 @@ PORTNAME= xdg-utils PORTVERSION= 1.1.3 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://portland.freedesktop.org/download/ diff --git a/devel/xdg-utils/files/patch-scripts_xdg-screensaver.in b/devel/xdg-utils/files/patch-scripts_xdg-screensaver.in index 8c2dca2b6fca..feb17cc88355 100644 --- a/devel/xdg-utils/files/patch-scripts_xdg-screensaver.in +++ b/devel/xdg-utils/files/patch-scripts_xdg-screensaver.in @@ -1,4 +1,4 @@ ---- scripts/xdg-screensaver.in.orig 2019-01-08 19:02:17 UTC +--- scripts/xdg-screensaver.in.orig 2018-05-10 15:02:31 UTC +++ scripts/xdg-screensaver.in @@ -27,7 +27,9 @@ _USAGE #@xdg-utils-common@ @@ -11,3 +11,13 @@ # We can securely move files in /tmp with mv -T DEBUG 1 "mv -T available" MV="mv -T" +@@ -378,7 +380,8 @@ screensaver_kde3() + + xset_screensaver_timeout() + { +- xset q | sed '/^Screen Saver:/,/^[^ ]/ { s/.*timeout: *\([0-9]*\).*/\1/; t }; d' ++ xset q | sed '/^Screen Saver:/,/^[^ ]/ { s/.*timeout: *\([0-9]*\).*/\1/; t ++ }; d' + } + + screensaver_xserver()