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) --- databases/phppgadmin/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'databases/phppgadmin/Makefile') diff --git a/databases/phppgadmin/Makefile b/databases/phppgadmin/Makefile index 91d6b703058e..9cbea2022f1b 100644 --- a/databases/phppgadmin/Makefile +++ b/databases/phppgadmin/Makefile @@ -40,9 +40,9 @@ do-install: ${CP} -Rp ${WRKSRC}/ ${PREFIX}/${PGADMDIR}/ .if exists(${PREFIX}/${PGADMOLDDIR}/conf/config.inc.php) ${CP} -np ${PREFIX}/${PGADMOLDDIR}/conf/config.inc.php \ - ${PREFIX}/${PGADMDIR}/conf/config.inc.php + ${PREFIX}/${PGADMDIR}/conf/config.inc.php || ${TRUE} .endif ${CP} -np ${PREFIX}/${PGADMDIR}/conf/config.inc.php-dist \ - ${PREFIX}/${PGADMDIR}/conf/config.inc.php + ${PREFIX}/${PGADMDIR}/conf/config.inc.php || ${TRUE} .include -- cgit v1.2.3