aboutsummaryrefslogtreecommitdiff
path: root/mail/postfixadmin
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 /mail/postfixadmin
parentb3db8883de118166da92dad3b8b07b17378c911c (diff)
downloadports-5ac18767d1594a7c77ba505b9672eb4e3b5284bc.tar.gz
ports-5ac18767d1594a7c77ba505b9672eb4e3b5284bc.zip
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 'mail/postfixadmin')
-rw-r--r--mail/postfixadmin/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/mail/postfixadmin/Makefile b/mail/postfixadmin/Makefile
index fe7e15b03155..910d779c7618 100644
--- a/mail/postfixadmin/Makefile
+++ b/mail/postfixadmin/Makefile
@@ -60,7 +60,7 @@ do-install:
(cd ${WRKSRC}/ && \
${COPYTREE_SHARE} \*.php ${PREFIX}/www/postfixadmin "! -name config.inc.php")
@${CP} ${WRKSRC}/config.inc.php ${PREFIX}/www/postfixadmin/config.inc.php.sample
- @${CP} -n ${WRKSRC}/config.inc.php ${PREFIX}/www/postfixadmin/config.inc.php
+ @${CP} -n ${WRKSRC}/config.inc.php ${PREFIX}/www/postfixadmin/config.inc.php || ${TRUE}
@${INSTALL_DATA} ${WRKSRC}/*.txt ${PREFIX}/www/postfixadmin
@${INSTALL_DATA} ${WRKSRC}/*.TXT ${PREFIX}/www/postfixadmin
@${INSTALL_DATA} ${WRKSRC}/css/* ${PREFIX}/www/postfixadmin/css