aboutsummaryrefslogtreecommitdiff
path: root/x11/xdm
diff options
context:
space:
mode:
authorFlorian Smeets <flo@FreeBSD.org>2013-05-04 22:48:03 +0000
committerFlorian Smeets <flo@FreeBSD.org>2013-05-04 22:48:03 +0000
commit5ac18767d1594a7c77ba505b9672eb4e3b5284bc (patch)
treeab399d9912d8f00891d9d8508edf96aa3ef0bc0b /x11/xdm
parentb3db8883de118166da92dad3b8b07b17378c911c (diff)
Fix installation of ports that rely on cp -n for installing files. r245960
changed cp to exit with a non-zero exit code if the file exists and is not overwritten thus causing ports to fail installing when e.g. trying to cp .default -> .conf files that already exist. We just ignore the error and continue, as we used to. Reported by: jaset Approved by: portmgr (bapt)
Notes
Notes: svn path=/head/; revision=317389
Diffstat (limited to 'x11/xdm')
-rw-r--r--x11/xdm/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/x11/xdm/Makefile b/x11/xdm/Makefile
index 862050b5cdff..d54413cb4528 100644
--- a/x11/xdm/Makefile
+++ b/x11/xdm/Makefile
@@ -49,7 +49,7 @@ post-configure:
post-install:
.for f in ${CFFILES}
- ${CP} -n ${EXAMPLESDIR}/$f ${PREFIX}/lib/X11/xdm/$f
+ ${CP} -n ${EXAMPLESDIR}/$f ${PREFIX}/lib/X11/xdm/$f || ${TRUE}
.endfor
${MKDIR} /var/lib/xdm/authdir
${LN} -sf /var/lib/xdm/authdir ${PREFIX}/lib/X11/xdm/authdir