diff options
| author | flo <flo@FreeBSD.org> | 2013-05-05 06:48:03 +0800 |
|---|---|---|
| committer | flo <flo@FreeBSD.org> | 2013-05-05 06:48:03 +0800 |
| commit | 02ba370ac4348e20c88c9698d4e91f3fe34868c8 (patch) | |
| tree | ab399d9912d8f00891d9d8508edf96aa3ef0bc0b /ftp/proftpd | |
| parent | ab79042bad4c4010d43e6983f39a47e3575126a5 (diff) | |
| download | freebsd-ports-gnome-02ba370ac4348e20c88c9698d4e91f3fe34868c8.tar.gz freebsd-ports-gnome-02ba370ac4348e20c88c9698d4e91f3fe34868c8.tar.zst freebsd-ports-gnome-02ba370ac4348e20c88c9698d4e91f3fe34868c8.zip | |
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 'ftp/proftpd')
| -rw-r--r-- | ftp/proftpd/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile index 97e76d2d1cb7..6d120a493375 100644 --- a/ftp/proftpd/Makefile +++ b/ftp/proftpd/Makefile @@ -247,10 +247,10 @@ pre-build: @cd ${WRKSRC} && ${MAKE} include/buildstamp.h .else post-install: - @cd ${PREFIX}/etc/ && ${CP} -n proftpd.conf.sample proftpd.conf + @cd ${PREFIX}/etc/ && ${CP} -n proftpd.conf.sample proftpd.conf || ${TRUE} @${MKDIR} ${LOCALSTATEDIR}/proftpd - @cd ${PREFIX}/etc/proftpd && ${CP} -n dhparams.pem.sample dhparams.pem - @cd ${PREFIX}/etc/proftpd && ${CP} -n blacklist.dat.sample blacklist.dat + @cd ${PREFIX}/etc/proftpd && ${CP} -n dhparams.pem.sample dhparams.pem || ${TRUE} + @cd ${PREFIX}/etc/proftpd && ${CP} -n blacklist.dat.sample blacklist.dat || ${TRUE} .if ${PORT_OPTIONS:MDOCS} @${INSTALL} -d ${DOCSDIR} @cd ${WRKSRC} && ${CP} README* RELEASE_NOTES ${DOCSDIR} |