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 /net-im/jggtrans | |
| parent | b3db8883de118166da92dad3b8b07b17378c911c (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)
Notes
Notes:
svn path=/head/; revision=317389
Diffstat (limited to 'net-im/jggtrans')
| -rw-r--r-- | net-im/jggtrans/Makefile | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net-im/jggtrans/Makefile b/net-im/jggtrans/Makefile index 345b1c19d8d0..92d5385f771d 100644 --- a/net-im/jggtrans/Makefile +++ b/net-im/jggtrans/Makefile @@ -1,7 +1,4 @@ -# Ports collection makefile for: jggtrans -# Date created: 13 September 2006 -# Whom: Bartek Rutkowski <r@robakdesign.com> -# +# Created by: Bartek Rutkowski <r@robakdesign.com> # $FreeBSD$ PORTNAME= jggtrans @@ -49,7 +46,7 @@ SUB_LIST+= JABBER_USER=${JABBER_USER} post-install: @${INSTALL_DATA} ${WRKSRC}/jggtrans.xml ${PREFIX}/etc/jggtrans.xml.sample - @${CP} -n ${WRKSRC}/jggtrans.xml ${PREFIX}/etc/jggtrans.xml + @${CP} -n ${WRKSRC}/jggtrans.xml ${PREFIX}/etc/jggtrans.xml || ${TRUE} @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> |