svn commit: r494714 - in head/devel/xdg-utils: . files

Tijl Coosemans tijl at FreeBSD.org
Tue Mar 5 17:00:27 UTC 2019


Author: tijl
Date: Tue Mar  5 17:00:25 2019
New Revision: 494714
URL: https://svnweb.freebsd.org/changeset/ports/494714

Log:
  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)

Modified:
  head/devel/xdg-utils/Makefile
  head/devel/xdg-utils/files/patch-scripts_xdg-screensaver.in

Modified: head/devel/xdg-utils/Makefile
==============================================================================
--- head/devel/xdg-utils/Makefile	Tue Mar  5 17:00:04 2019	(r494713)
+++ head/devel/xdg-utils/Makefile	Tue Mar  5 17:00:25 2019	(r494714)
@@ -3,6 +3,7 @@
 
 PORTNAME=	xdg-utils
 PORTVERSION=	1.1.3
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://portland.freedesktop.org/download/
 

Modified: head/devel/xdg-utils/files/patch-scripts_xdg-screensaver.in
==============================================================================
--- head/devel/xdg-utils/files/patch-scripts_xdg-screensaver.in	Tue Mar  5 17:00:04 2019	(r494713)
+++ head/devel/xdg-utils/files/patch-scripts_xdg-screensaver.in	Tue Mar  5 17:00:25 2019	(r494714)
@@ -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()


More information about the svn-ports-all mailing list