From 5ac18767d1594a7c77ba505b9672eb4e3b5284bc Mon Sep 17 00:00:00 2001
From: Florian Smeets <flo@FreeBSD.org>
Date: Sat, 4 May 2013 22:48:03 +0000
Subject: 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)
---
 lang/php53/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lang/php53')

diff --git a/lang/php53/Makefile b/lang/php53/Makefile
index c4e8a6925072..ceef43a79e86 100644
--- a/lang/php53/Makefile
+++ b/lang/php53/Makefile
@@ -185,7 +185,7 @@ post-install:
 	@${INSTALL_DATA} ${WRKDIR}/php.conf ${PREFIX}/etc
 	@${TOUCH} ${PREFIX}/include/php/ext/php_config.h
 .if ${PORT_OPTIONS:MFPM}
-	@${CP} -n ${PREFIX}/etc/php-fpm.conf.default ${PREFIX}/etc/php-fpm.conf
+	@${CP} -n ${PREFIX}/etc/php-fpm.conf.default ${PREFIX}/etc/php-fpm.conf || ${TRUE}
 .endif
 .if ${PORT_OPTIONS:MAPACHE}
 	@${CAT} ${PKGMESSAGE}
-- 
cgit v1.2.3