Date: Sun, 30 Jun 2013 00:15:52 +0200 From: nemysis <nemysis@gmx.ch> To: FreeBSD-gnats-submit@freebsd.org Cc: jpaetzel@FreeBSD.org Subject: ports/180111: [MAINTAINER] misc/lxde-common: Fix preserve original *.conf files Message-ID: <20130629221557.57F61AD7@hub.freebsd.org> Resent-Message-ID: <201306292220.r5TMK0tx051058@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130629221557.57F61AD7>