Bug 180111 - [MAINTAINER] misc/lxde-common: Fix preserve original *.conf files
Summary: [MAINTAINER] misc/lxde-common: Fix preserve original *.conf files
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: William Grzybowski
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-06-29 23:20 UTC by nemysis
Modified: 2013-07-01 15:50 UTC (History)
1 user (show)

See Also:


Attachments
lxde-common-0.5.5_4.patch (1.06 KB, patch)
2013-06-29 23:20 UTC, nemysis
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description nemysis 2013-06-29 23:20:00 UTC
- 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)
Comment 1 dfilter service freebsd_committer freebsd_triage 2013-07-01 15:42:45 UTC
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}
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 2 William Grzybowski freebsd_committer freebsd_triage 2013-07-01 15:42:56 UTC
Responsible Changed
From-To: freebsd-ports-bugs->wg

I'll take it.
Comment 3 William Grzybowski freebsd_committer freebsd_triage 2013-07-01 15:43:05 UTC
State Changed
From-To: open->closed

Committed. Thanks!