From owner-svn-ports-head@freebsd.org Tue Mar 5 17:00:27 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 14EA31508EC2; Tue, 5 Mar 2019 17:00:27 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AD09D74299; Tue, 5 Mar 2019 17:00:26 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A051A1EE98; Tue, 5 Mar 2019 17:00:26 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x25H0QPU091894; Tue, 5 Mar 2019 17:00:26 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x25H0Qj7091892; Tue, 5 Mar 2019 17:00:26 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201903051700.x25H0Qj7091892@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Tue, 5 Mar 2019 17:00:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r494714 - in head/devel/xdg-utils: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tijl X-SVN-Commit-Paths: in head/devel/xdg-utils: . files X-SVN-Commit-Revision: 494714 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: AD09D74299 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.95)[-0.955,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Mar 2019 17:00:27 -0000 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()