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)
This commit is contained in:
Tijl Coosemans 2019-03-05 17:00:25 +00:00
parent 14d398e912
commit 5f9991a88d
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=494714
2 changed files with 12 additions and 1 deletions

View file

@ -3,6 +3,7 @@
PORTNAME= xdg-utils PORTNAME= xdg-utils
PORTVERSION= 1.1.3 PORTVERSION= 1.1.3
PORTREVISION= 1
CATEGORIES= devel CATEGORIES= devel
MASTER_SITES= http://portland.freedesktop.org/download/ MASTER_SITES= http://portland.freedesktop.org/download/

View file

@ -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 +++ scripts/xdg-screensaver.in
@@ -27,7 +27,9 @@ _USAGE @@ -27,7 +27,9 @@ _USAGE
#@xdg-utils-common@ #@xdg-utils-common@
@ -11,3 +11,13 @@
# We can securely move files in /tmp with mv -T # We can securely move files in /tmp with mv -T
DEBUG 1 "mv -T available" DEBUG 1 "mv -T available"
MV="mv -T" 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()