From owner-svn-ports-all@FreeBSD.ORG  Mon Jul  1 14:42:38 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 4AD2E764;
 Mon,  1 Jul 2013 14:42:38 +0000 (UTC) (envelope-from wg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 3CC5D1EE3;
 Mon,  1 Jul 2013 14:42:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r61EgcSj043032;
 Mon, 1 Jul 2013 14:42:38 GMT (envelope-from wg@svn.freebsd.org)
Received: (from wg@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r61EgcDD043031;
 Mon, 1 Jul 2013 14:42:38 GMT (envelope-from wg@svn.freebsd.org)
Message-Id: <201307011442.r61EgcDD043031@svn.freebsd.org>
From: William Grzybowski <wg@FreeBSD.org>
Date: Mon, 1 Jul 2013 14:42:38 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r322129 - head/misc/lxde-common
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Jul 2013 14:42:38 -0000

Author: wg
Date: Mon Jul  1 14:42:37 2013
New Revision: 322129
URL: http://svnweb.freebsd.org/changeset/ports/322129

Log:
  misc/lxde-common: preserve conf files
  
  - Fix preservation of old .conf files
  
  PR:		ports/180111
  Submitted by:	nemysis <nemysis@gmx.ch> (maintainer)

Modified:
  head/misc/lxde-common/Makefile

Modified: head/misc/lxde-common/Makefile
==============================================================================
--- head/misc/lxde-common/Makefile	Mon Jul  1 14:33:42 2013	(r322128)
+++ head/misc/lxde-common/Makefile	Mon Jul  1 14:42:37 2013	(r322129)
@@ -37,12 +37,10 @@ OPTIONS_DEFINE=	DOCS
 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}