From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jun 29 22:20:01 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 0D896B16 for ; Sat, 29 Jun 2013 22:20:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id E4D691838 for ; Sat, 29 Jun 2013 22:20:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r5TMK0Tb051069 for ; Sat, 29 Jun 2013 22:20:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r5TMK0tx051058; Sat, 29 Jun 2013 22:20:00 GMT (envelope-from gnats) Resent-Date: Sat, 29 Jun 2013 22:20:00 GMT Resent-Message-Id: <201306292220.r5TMK0tx051058@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, nemysis Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 57F61AD7 for ; Sat, 29 Jun 2013 22:15:57 +0000 (UTC) (envelope-from nemysis@gmx.ch) Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) by mx1.freebsd.org (Postfix) with ESMTP id EE39F1826 for ; Sat, 29 Jun 2013 22:15:56 +0000 (UTC) Received: from mailout-de.gmx.net ([10.1.76.24]) by mrigmx.server.lan (mrigmx001) with ESMTP (Nemesis) id 0M52ci-1U2qeI0G2Y-00zCEr for ; Sun, 30 Jun 2013 00:15:56 +0200 Received: (qmail invoked by alias); 29 Jun 2013 22:15:54 -0000 Received: from 5-80.77-83.cust.bluewin.ch (EHLO something.email.com) [83.77.80.5] by mail.gmx.net (mp024) with SMTP; 30 Jun 2013 00:15:54 +0200 Received: by something.email.com (sSMTP sendmail emulation); Sun, 30 Jun 2013 00:15:52 +0200 Message-Id: <20130629221557.57F61AD7@hub.freebsd.org> Date: Sun, 30 Jun 2013 00:15:52 +0200 From: nemysis To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/180111: [MAINTAINER] misc/lxde-common: Fix preserve original *.conf files Cc: jpaetzel@FreeBSD.org X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Jun 2013 22:20:01 -0000 >Number: 180111 >Category: ports >Synopsis: [MAINTAINER] misc/lxde-common: Fix preserve original *.conf files >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Jun 29 22:20:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: nemysis >Release: FreeBSD 9.1-RELEASE-p8 amd64 >Organization: >Environment: System: FreeBSD FreeBSD_Ports 9.1-RELEASE-p8 FreeBSD 9.1-RELEASE-p8 #0: Tue Jun 18 15:25:28 UTC 2013 >Description: - Fix preserve original *.conf files Generated and tested manually, tested with port test, sent with FreeBSD Port Tools 0.99_8 (mode: change, diff: ports) >How-To-Repeat: >Fix: --- lxde-common-0.5.5_4.patch begins here --- diff -ruN /usr/ports/misc/lxde-common/Makefile ./Makefile --- /usr/ports/misc/lxde-common/Makefile 2013-06-22 16:05:40.000000000 +0200 +++ ./Makefile 2013-06-29 23:55:09.000000000 +0200 @@ -37,12 +37,10 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/desktop.conf ${PREFIX}/etc/xdg/lxsession/LXDE/desktop.conf.sample ${INSTALL_DATA} ${WRKSRC}/pcmanfm/pcmanfm.conf ${PREFIX}/etc/xdg/pcmanfm/LXDE/pcmanfm.conf.sample -.if ! exists(${PREFIX}/etc/xdg/lxsession/LXDE/desktop.conf) - ${INSTALL_DATA} ${WRKSRC}/desktop.conf ${PREFIX}/etc/xdg/lxsession/LXDE/desktop.conf -.endif -.if ! exists(${PREFIX}/etc/xdg/pcmanfm/LXDE/pcmanfm.conf) - ${INSTALL_DATA} ${WRKSRC}/pcmanfm/pcmanfm.conf ${PREFIX}/etc/xdg/pcmanfm/LXDE/pcmanfm.conf -.endif + @[ -f ${PREFIX}/etc/xdg/lxsession/LXDE/desktop.conf ] || \ + ${INSTALL_DATA} ${WRKSRC}/desktop.conf ${PREFIX}/etc/xdg/lxsession/LXDE/desktop.conf + @[ -f ${PREFIX}/etc/xdg/pcmanfm/LXDE/pcmanfm.conf ] || \ + ${INSTALL_DATA} ${WRKSRC}/pcmanfm/pcmanfm.conf ${PREFIX}/etc/xdg/pcmanfm/LXDE/pcmanfm.conf .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} --- lxde-common-0.5.5_4.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: