Received: by mail.netbsd.org (Postfix, from userid 605) id 20F4E85572; Thu, 22 Jun 2017 09:40:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A51FF84DE4 for ; Thu, 22 Jun 2017 09:40:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id AkK_2vuRKZ4Y for ; Thu, 22 Jun 2017 09:40:25 +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 00BFD84CE4 for ; Thu, 22 Jun 2017 09:40:24 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id EFC1DFAE8; Thu, 22 Jun 2017 09:40:24 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_149812442438000" MIME-Version: 1.0 Date: Thu, 22 Jun 2017 09:40:24 +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: <20170622094024.EFC1DFAE8@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. --_----------=_149812442438000 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: youri Date: Thu Jun 22 09:40:24 UTC 2017 Modified Files: pkgsrc/x11/xfce4-session: Makefile distinfo pkgsrc/x11/xfce4-session/patches: patch-ac patch-config.h.in patch-configure patch-scripts_Makefile.in patch-settings_xfce4-session.xml Removed Files: pkgsrc/x11/xfce4-session/patches: patch-xfce4-session_xfsm-global.h Log Message: Cleanup, thanks leot@ for the heads up! To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 pkgsrc/x11/xfce4-session/Makefile cvs rdiff -u -r1.20 -r1.21 pkgsrc/x11/xfce4-session/distinfo cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/xfce4-session/patches/patch-ac cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/xfce4-session/patches/patch-config.h.in cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/xfce4-session/patches/patch-configure \ pkgsrc/x11/xfce4-session/patches/patch-scripts_Makefile.in \ pkgsrc/x11/xfce4-session/patches/patch-settings_xfce4-session.xml cvs rdiff -u -r1.1 -r0 \ pkgsrc/x11/xfce4-session/patches/patch-xfce4-session_xfsm-global.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_149812442438000 Content-Disposition: inline Content-Length: 5616 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.59 pkgsrc/x11/xfce4-session/Makefile:1.60 --- pkgsrc/x11/xfce4-session/Makefile:1.59 Sun Jun 18 22:37:33 2017 +++ pkgsrc/x11/xfce4-session/Makefile Thu Jun 22 09:40:24 2017 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.59 2017/06/18 22:37:33 youri Exp $ +# $NetBSD: Makefile,v 1.60 2017/06/22 09:40:24 youri Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" @@ -49,5 +49,4 @@ CONF_FILES+= ${EGDIR}/xinitrc \ .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../x11/libxfce4ui/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "options.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/x11/xfce4-session/distinfo diff -u pkgsrc/x11/xfce4-session/distinfo:1.20 pkgsrc/x11/xfce4-session/distinfo:1.21 --- pkgsrc/x11/xfce4-session/distinfo:1.20 Sun Jun 18 22:37:33 2017 +++ pkgsrc/x11/xfce4-session/distinfo Thu Jun 22 09:40:24 2017 @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.20 2017/06/18 22:37:33 youri Exp $ +$NetBSD: distinfo,v 1.21 2017/06/22 09:40:24 youri Exp $ SHA1 (xfce4-session-4.13.0.tar.bz2) = 23d93a524870c0402c83ab23650a63bcaeaeb234 RMD160 (xfce4-session-4.13.0.tar.bz2) = ab9fda8e31891ce9e244e9d7d15fc865d5a6f6c1 SHA512 (xfce4-session-4.13.0.tar.bz2) = 61f9a547b03eb109a1a0fc83feaac743ea2119360f2f7208e589feb3e8f1db016ffe85cf1c8e20633ec399f263dcbccd35c431bde6f6f1482658688096da5cb0 Size (xfce4-session-4.13.0.tar.bz2) = 1314715 bytes -SHA1 (patch-ac) = 14398273b8169d26f89262310c1ca4d8546a2c0c -SHA1 (patch-config.h.in) = 88c67de7708c958674de7f222937739dd9f7fc00 -SHA1 (patch-configure) = 10b5a5dd2047685012c1a898204cc695c9a70d35 -SHA1 (patch-scripts_Makefile.in) = 1d1f2230fc861f222f44b9541d52c157a23c16dc -SHA1 (patch-settings_xfce4-session.xml) = 6607e682df06674c4e6a3219b911f58f756cfab7 +SHA1 (patch-ac) = 6d6ecae678ef34b0435ea40fa75ce51aeea1509d +SHA1 (patch-config.h.in) = 30e2ae1ea70a99a83f11523e940081b661add69b +SHA1 (patch-configure) = 55a15e79821b89cc37f6ebedac6ad1804cdee38a +SHA1 (patch-scripts_Makefile.in) = 042c3d9c632a57f9acfc8dab43aa6bca8ec69097 +SHA1 (patch-settings_xfce4-session.xml) = 86a50db54aede973d7495869e3e713a39a73446d SHA1 (patch-xfsm-shutdown-helper_main.c) = 6f885efe31597360bb9534007daffa46df41c831 Index: pkgsrc/x11/xfce4-session/patches/patch-ac diff -u pkgsrc/x11/xfce4-session/patches/patch-ac:1.3 pkgsrc/x11/xfce4-session/patches/patch-ac:1.4 --- pkgsrc/x11/xfce4-session/patches/patch-ac:1.3 Mon Jun 29 16:50:01 2015 +++ pkgsrc/x11/xfce4-session/patches/patch-ac Thu Jun 22 09:40:24 2017 @@ -1,6 +1,7 @@ -$NetBSD: patch-ac,v 1.3 2015/06/29 16:50:01 youri Exp $ +$NetBSD: patch-ac,v 1.4 2017/06/22 09:40:24 youri Exp $ Adjust config path. + --- settings/Makefile.in.orig 2015-03-16 07:29:45.000000000 +0000 +++ settings/Makefile.in @@ -452,7 +452,7 @@ xfce4_session_settings_LDADD = \ Index: pkgsrc/x11/xfce4-session/patches/patch-config.h.in diff -u pkgsrc/x11/xfce4-session/patches/patch-config.h.in:1.1 pkgsrc/x11/xfce4-session/patches/patch-config.h.in:1.2 --- pkgsrc/x11/xfce4-session/patches/patch-config.h.in:1.1 Thu Jul 2 13:15:58 2015 +++ pkgsrc/x11/xfce4-session/patches/patch-config.h.in Thu Jun 22 09:40:24 2017 @@ -1,6 +1,7 @@ -$NetBSD: patch-config.h.in,v 1.1 2015/07/02 13:15:58 youri Exp $ +$NetBSD: patch-config.h.in,v 1.2 2017/06/22 09:40:24 youri Exp $ Add NetBSD backend. + --- config.h.in.orig 2015-03-16 07:29:52.000000000 +0000 +++ config.h.in @@ -12,6 +12,9 @@ Index: pkgsrc/x11/xfce4-session/patches/patch-configure diff -u pkgsrc/x11/xfce4-session/patches/patch-configure:1.2 pkgsrc/x11/xfce4-session/patches/patch-configure:1.3 --- pkgsrc/x11/xfce4-session/patches/patch-configure:1.2 Tue Jul 7 14:04:22 2015 +++ pkgsrc/x11/xfce4-session/patches/patch-configure Thu Jun 22 09:40:24 2017 @@ -1,6 +1,7 @@ -$NetBSD: patch-configure,v 1.2 2015/07/07 14:04:22 youri Exp $ +$NetBSD: patch-configure,v 1.3 2017/06/22 09:40:24 youri Exp $ Add NetBSD backend detection. + --- configure.orig 2015-03-16 07:29:45.000000000 +0000 +++ configure @@ -18208,6 +18208,8 @@ if test x$with_backend = x; then Index: pkgsrc/x11/xfce4-session/patches/patch-scripts_Makefile.in diff -u pkgsrc/x11/xfce4-session/patches/patch-scripts_Makefile.in:1.2 pkgsrc/x11/xfce4-session/patches/patch-scripts_Makefile.in:1.3 --- pkgsrc/x11/xfce4-session/patches/patch-scripts_Makefile.in:1.2 Mon Jun 29 16:50:01 2015 +++ pkgsrc/x11/xfce4-session/patches/patch-scripts_Makefile.in Thu Jun 22 09:40:24 2017 @@ -1,6 +1,7 @@ -$NetBSD: patch-scripts_Makefile.in,v 1.2 2015/06/29 16:50:01 youri Exp $ +$NetBSD: patch-scripts_Makefile.in,v 1.3 2017/06/22 09:40:24 youri Exp $ Adjust config path. + --- scripts/Makefile.in.orig 2015-03-16 07:29:45.000000000 +0000 +++ scripts/Makefile.in @@ -363,12 +363,12 @@ edit = $(SED) \ Index: pkgsrc/x11/xfce4-session/patches/patch-settings_xfce4-session.xml diff -u pkgsrc/x11/xfce4-session/patches/patch-settings_xfce4-session.xml:1.2 pkgsrc/x11/xfce4-session/patches/patch-settings_xfce4-session.xml:1.3 --- pkgsrc/x11/xfce4-session/patches/patch-settings_xfce4-session.xml:1.2 Mon Jun 29 16:50:01 2015 +++ pkgsrc/x11/xfce4-session/patches/patch-settings_xfce4-session.xml Thu Jun 22 09:40:24 2017 @@ -1,6 +1,7 @@ -$NetBSD: patch-settings_xfce4-session.xml,v 1.2 2015/06/29 16:50:01 youri Exp $ +$NetBSD: patch-settings_xfce4-session.xml,v 1.3 2017/06/22 09:40:24 youri Exp $ Look for the right thunar binary. + --- settings/xfce4-session.xml.orig 2014-08-28 15:50:18.000000000 +0000 +++ settings/xfce4-session.xml @@ -21,7 +21,7 @@ --_----------=_149812442438000--