diff options
| author | Florian Smeets <flo@FreeBSD.org> | 2013-05-04 22:48:03 +0000 |
|---|---|---|
| committer | Florian Smeets <flo@FreeBSD.org> | 2013-05-04 22:48:03 +0000 |
| commit | 5ac18767d1594a7c77ba505b9672eb4e3b5284bc (patch) | |
| tree | ab399d9912d8f00891d9d8508edf96aa3ef0bc0b /lang/php5 | |
| parent | Do not overwrite BUILD_DEPENDS (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)
Diffstat (limited to 'lang/php5')
| -rw-r--r-- | lang/php5/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lang/php5/Makefile b/lang/php5/Makefile index a6c47724232a..80665e19fe8e 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -195,7 +195,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} |