From 5ac18767d1594a7c77ba505b9672eb4e3b5284bc Mon Sep 17 00:00:00 2001 From: Florian Smeets 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/php52/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lang/php52') diff --git a/lang/php52/Makefile b/lang/php52/Makefile index d34b2ef8d7a1..c5ed6752d336 100644 --- a/lang/php52/Makefile +++ b/lang/php52/Makefile @@ -216,7 +216,7 @@ post-install: @${INSTALL_DATA} ${WRKDIR}/php-fpm.conf.sample ${PREFIX}/etc @${MKDIR} `dirname ${PHP_FPM_PID}` @${MKDIR} `dirname ${PHP_FPM_LOG}` - @cd ${PREFIX}/etc && ${CP} -n php-fpm.conf.sample php-fpm.conf + @cd ${PREFIX}/etc && ${CP} -n php-fpm.conf.sample php-fpm.conf || ${TRUE} .endif .if defined(WITH_APACHE) @${CAT} ${PKGMESSAGE} -- cgit v1.2.3