Received: by mail.netbsd.org (Postfix, from userid 605) id DDC6984E44; Tue, 29 May 2018 00:45:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 09F2984D63 for ; Tue, 29 May 2018 00:45:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 4dsN69XKzJA0 for ; Tue, 29 May 2018 00:45:04 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 8461B84E3D for ; Tue, 29 May 2018 00:45:04 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 7775CFBEB; Tue, 29 May 2018 00:45:04 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1527554704181030" MIME-Version: 1.0 Date: Tue, 29 May 2018 00:45:04 +0000 From: "Youri Mouton" Subject: CVS commit: pkgsrc/x11/xfce4-session To: pkgsrc-changes@NetBSD.org Reply-To: youri@netbsd.org X-Mailer: log_accum Message-Id: <20180529004504.7775CFBEB@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1527554704181030 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: youri Date: Tue May 29 00:45:04 UTC 2018 Modified Files: pkgsrc/x11/xfce4-session: Makefile Log Message: Fix installation of the xscreensaver autostart file so that Xfce4 users can lock their screen from the panel without any extra work. Also depend on xscreensaver now. To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.67 pkgsrc/x11/xfce4-session/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1527554704181030 Content-Disposition: inline Content-Length: 1805 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/xfce4-session/Makefile diff -u pkgsrc/x11/xfce4-session/Makefile:1.66 pkgsrc/x11/xfce4-session/Makefile:1.67 --- pkgsrc/x11/xfce4-session/Makefile:1.66 Wed May 16 18:06:04 2018 +++ pkgsrc/x11/xfce4-session/Makefile Tue May 29 00:45:04 2018 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.66 2018/05/16 18:06:04 youri Exp $ +# $NetBSD: Makefile,v 1.67 2018/05/29 00:45:04 youri Exp $ -PKGREVISION= 4 +PKGREVISION= 5 .include "../../meta-pkgs/xfce4/Makefile.common" DISTNAME= xfce4-session-4.13.0 @@ -32,13 +32,13 @@ MAKE_DIRS+= ${PKG_SYSCONFDIR} ${PKG_SYSC MAKE_DIRS+= ${EGDIR} ${EGDIR}/autostart ${EGDIR}/xfconf MAKE_DIRS+= ${EGDIR}/xfconf/xfce-perchannel-xml -CONF_FILES= ${EGDIR}/autostart/xscreensaver.desktop \ - ${PKG_SYSCONFDIR}/autostart/xscreensaver.desktop -CONF_FILES= ${EGDIR}/xfconf/xfce-perchannel-xml/xfce4-session.xml \ - ${PKG_SYSCONFDIR}/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml -CONF_FILES+= ${EGDIR}/Xft.xrdb \ - ${PKG_SYSCONFDIR}/xfce4/Xft.xrdb -CONF_FILES+= ${EGDIR}/xinitrc \ +CONF_FILES= ${EGDIR}/autostart/xscreensaver.desktop \ + ${PKG_SYSCONFDIR}/autostart/xscreensaver.desktop \ + ${EGDIR}/xfconf/xfce-perchannel-xml/xfce4-session.xml \ + ${PKG_SYSCONFDIR}/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml \ + ${EGDIR}/Xft.xrdb \ + ${PKG_SYSCONFDIR}/xfce4/Xft.xrdb \ + ${EGDIR}/xinitrc \ ${PKG_SYSCONFDIR}/xfce4/xinitrc .if !empty(Darwin-*-*) @@ -51,5 +51,6 @@ CONF_FILES+= ${EGDIR}/xinitrc \ .include "../../devel/libwnck3/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../x11/libxfce4ui/buildlink3.mk" +.include "../../x11/xscreensaver/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../mk/bsd.pkg.mk" --_----------=_1527554704181030--