Date: Sat, 4 May 2013 22:48:04 +0000 (UTC) From: Florian Smeets <flo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317389 - in head: archivers/dact comms/ncid databases/phppgadmin deskutils/plans devel/pear ftp/proftpd games/mangos irc/darkbot lang/php5 lang/php52 lang/php53 mail/postfixadmin net-i... Message-ID: <201305042248.r44Mm4Bx082743@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: flo Date: Sat May 4 22:48:03 2013 New Revision: 317389 URL: http://svnweb.freebsd.org/changeset/ports/317389 Log: 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) Modified: head/archivers/dact/Makefile (contents, props changed) head/comms/ncid/Makefile (contents, props changed) head/databases/phppgadmin/Makefile (contents, props changed) head/deskutils/plans/Makefile (contents, props changed) head/devel/pear/Makefile (contents, props changed) head/ftp/proftpd/Makefile (contents, props changed) head/games/mangos/Makefile (contents, props changed) head/irc/darkbot/Makefile (contents, props changed) head/lang/php5/Makefile (contents, props changed) head/lang/php52/Makefile head/lang/php53/Makefile head/mail/postfixadmin/Makefile head/net-im/jggtrans/Makefile head/net-mgmt/xymon-client/Makefile head/net-mgmt/xymon-server/Makefile head/net/relayd/Makefile (contents, props changed) head/net/ushare/Makefile head/security/sancp/Makefile (contents, props changed) head/textproc/pootle/Makefile head/www/c-icap-modules/Makefile (contents, props changed) head/www/c-icap/Makefile (contents, props changed) head/x11/xdm/Makefile (contents, props changed) Modified: head/archivers/dact/Makefile ============================================================================== --- head/archivers/dact/Makefile Sat May 4 22:32:54 2013 (r317388) +++ head/archivers/dact/Makefile Sat May 4 22:48:03 2013 (r317389) @@ -39,7 +39,7 @@ pre-install: post-install: .if !defined(NOPORTEXAMPLES) @${MKDIR} ${EXAMPLESDIR} - ${CP} -n ${WRKSRC}/dact.conf ${EXAMPLESDIR} + ${CP} -n ${WRKSRC}/dact.conf ${EXAMPLESDIR} || ${TRUE} .endif .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} Modified: head/comms/ncid/Makefile ============================================================================== --- head/comms/ncid/Makefile Sat May 4 22:32:54 2013 (r317388) +++ head/comms/ncid/Makefile Sat May 4 22:48:03 2013 (r317389) @@ -1,9 +1,5 @@ -# New ports collection makefile for: ncid -# Date created: 06 June 2005 -# Whom: David -# +# Created by: David # $FreeBSD$ -# PORTNAME= ncid PORTVERSION= 0.84 @@ -53,7 +49,7 @@ post-install: @cd ${WRKSRC};for i in server/*.alias scripts/*.conf;do\ ib=`basename $$i`;\ ${INSTALL_DATA} $$i ${ETCDIR}/$$ib.dist;\ - ${CP} -n ${ETCDIR}/$$ib.dist ${ETCDIR}/$$ib;\ + ${CP} -n ${ETCDIR}/$$ib.dist ${ETCDIR}/$$ib || ${TRUE} ;\ ${ECHO_CMD} "@unexec cd %D/${ETCDIR_REL}/;! cmp -s $$ib $$ib.dist||\ ${RM} -f $$ib">>${TMPPLIST};\ ${ECHO_CMD} "${ETCDIR_REL}/$$ib.dist">>${TMPPLIST};\ Modified: head/databases/phppgadmin/Makefile ============================================================================== --- head/databases/phppgadmin/Makefile Sat May 4 22:32:54 2013 (r317388) +++ head/databases/phppgadmin/Makefile Sat May 4 22:48:03 2013 (r317389) @@ -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 <bsd.port.post.mk> Modified: head/deskutils/plans/Makefile ============================================================================== --- head/deskutils/plans/Makefile Sat May 4 22:32:54 2013 (r317388) +++ head/deskutils/plans/Makefile Sat May 4 22:48:03 2013 (r317389) @@ -1,9 +1,5 @@ -# New ports collection makefile for: plans -# Date created: 2004-12-17 -# Whom: Edwin Groothuis <edwin@mavetju.org> -# +# Created by: Edwin Groothuis <edwin@mavetju.org> # $FreeBSD$ -# PORTNAME= plans PORTVERSION= 8.2.1 @@ -62,7 +58,7 @@ do-install: @${FIND} ${WWWDIR} -name '*.cgi' -exec ${CHMOD} 755 {} \; @${FIND} ${WWWDIR} -name '*.xml' -exec ${CHMOD} 664 {} \; @for i in ${WWWDIR}/data/*default ${WWWDIR}/*default; do\ - ${CP} -np $$i $${i%.default}; done + ${CP} -np $$i $${i%.default} || ${TRUE} ; done @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> Modified: head/devel/pear/Makefile ============================================================================== --- head/devel/pear/Makefile Sat May 4 22:32:54 2013 (r317388) +++ head/devel/pear/Makefile Sat May 4 22:48:03 2013 (r317389) @@ -38,6 +38,6 @@ do-install: ${PEARDIR}/peclcmd.php post-install: - @${CP} -n ${PREFIX}/etc/pear.conf.sample ${PREFIX}/etc/pear.conf + @${CP} -n ${PREFIX}/etc/pear.conf.sample ${PREFIX}/etc/pear.conf || ${TRUE} .include <bsd.port.mk> Modified: head/ftp/proftpd/Makefile ============================================================================== --- head/ftp/proftpd/Makefile Sat May 4 22:32:54 2013 (r317388) +++ head/ftp/proftpd/Makefile Sat May 4 22:48:03 2013 (r317389) @@ -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} Modified: head/games/mangos/Makefile ============================================================================== --- head/games/mangos/Makefile Sat May 4 22:32:54 2013 (r317388) +++ head/games/mangos/Makefile Sat May 4 22:48:03 2013 (r317389) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mangos -# Date created: 15 March 2007 -# Whom: Artemiy Kropachev <neon_cyrex@mail.ru> -# +# Created by: Artemiy Kropachev <neon_cyrex@mail.ru> # $FreeBSD$ -# PORTNAME= mangos PORTVERSION= 5101 @@ -89,7 +85,7 @@ post-build: post-install: @for i in mangosd realmd;do cd ${PREFIX}/etc/&&\ ${INSTALL_DATA} ${WRKSRC}/src/$$i/$$i.conf $$i.conf.sample&&\ - ${CP} -np $$i.conf.sample $$i.conf;done + ${CP} -np $$i.conf.sample $$i.conf || ${TRUE} ;done .ifdef WITH_SCRIPTDEV2 @(cd ${INSTALL_WRKSRC}/src/bindings/ScriptDev2 && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) .endif Modified: head/irc/darkbot/Makefile ============================================================================== --- head/irc/darkbot/Makefile Sat May 4 22:32:54 2013 (r317388) +++ head/irc/darkbot/Makefile Sat May 4 22:48:03 2013 (r317389) @@ -35,12 +35,12 @@ post-install: cd ${WRKSRC}/dat; \ for file in *; do \ ${INSTALL_DATA} $$file ${ETCDIR}/dat/$${file}.dist; \ - ${CP} -np ${ETCDIR}/dat/$${file}.dist ${ETCDIR}/dat/$$file; \ + ${CP} -np ${ETCDIR}/dat/$${file}.dist ${ETCDIR}/dat/$$file || ${TRUE} ; \ ${ECHO_CMD} "@unexec cmp -s ${ETCDIR}/dat/$$file \ ${ETCDIR}/dat/$${file}.dist && \ rm -f ${ETCDIR}/dat/$$file || true" >> ${TMPPLIST}; \ ${ECHO_CMD} "${ETCDIR_REL}/dat/$${file}.dist" >> ${TMPPLIST}; \ - ${ECHO_CMD} "@exec cp -np %D/%F %B/$$file" >> ${TMPPLIST}; \ + ${ECHO_CMD} "@exec cp -np %D/%F %B/$$file || true" >> ${TMPPLIST}; \ done ${ECHO_CMD} "@unexec rmdir ${ETCDIR}/logs 2>/dev/null || true" >> ${TMPPLIST} ${ECHO_CMD} "@unexec rmdir ${ETCDIR}/dat 2>/dev/null || true" >> ${TMPPLIST} Modified: head/lang/php5/Makefile ============================================================================== --- head/lang/php5/Makefile Sat May 4 22:32:54 2013 (r317388) +++ head/lang/php5/Makefile Sat May 4 22:48:03 2013 (r317389) @@ -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} Modified: head/lang/php52/Makefile ============================================================================== --- head/lang/php52/Makefile Sat May 4 22:32:54 2013 (r317388) +++ head/lang/php52/Makefile Sat May 4 22:48:03 2013 (r317389) @@ -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} Modified: head/lang/php53/Makefile ============================================================================== --- head/lang/php53/Makefile Sat May 4 22:32:54 2013 (r317388) +++ head/lang/php53/Makefile Sat May 4 22:48:03 2013 (r317389) @@ -185,7 +185,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} Modified: head/mail/postfixadmin/Makefile ============================================================================== --- head/mail/postfixadmin/Makefile Sat May 4 22:32:54 2013 (r317388) +++ head/mail/postfixadmin/Makefile Sat May 4 22:48:03 2013 (r317389) @@ -60,7 +60,7 @@ do-install: (cd ${WRKSRC}/ && \ ${COPYTREE_SHARE} \*.php ${PREFIX}/www/postfixadmin "! -name config.inc.php") @${CP} ${WRKSRC}/config.inc.php ${PREFIX}/www/postfixadmin/config.inc.php.sample - @${CP} -n ${WRKSRC}/config.inc.php ${PREFIX}/www/postfixadmin/config.inc.php + @${CP} -n ${WRKSRC}/config.inc.php ${PREFIX}/www/postfixadmin/config.inc.php || ${TRUE} @${INSTALL_DATA} ${WRKSRC}/*.txt ${PREFIX}/www/postfixadmin @${INSTALL_DATA} ${WRKSRC}/*.TXT ${PREFIX}/www/postfixadmin @${INSTALL_DATA} ${WRKSRC}/css/* ${PREFIX}/www/postfixadmin/css Modified: head/net-im/jggtrans/Makefile ============================================================================== --- head/net-im/jggtrans/Makefile Sat May 4 22:32:54 2013 (r317388) +++ head/net-im/jggtrans/Makefile Sat May 4 22:48:03 2013 (r317389) @@ -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> Modified: head/net-mgmt/xymon-client/Makefile ============================================================================== --- head/net-mgmt/xymon-client/Makefile Sat May 4 22:32:54 2013 (r317388) +++ head/net-mgmt/xymon-client/Makefile Sat May 4 22:48:03 2013 (r317389) @@ -35,7 +35,7 @@ do-configure: post-install: .for i in ${CONFIG_FILES} ${CP} -np ${WWWDIR}/client/etc/${i}.DIST \ - ${WWWDIR}/client/etc/${i} + ${WWWDIR}/client/etc/${i} || ${TRUE} .endfor .include <bsd.port.mk> Modified: head/net-mgmt/xymon-server/Makefile ============================================================================== --- head/net-mgmt/xymon-server/Makefile Sat May 4 22:32:54 2013 (r317388) +++ head/net-mgmt/xymon-server/Makefile Sat May 4 22:48:03 2013 (r317389) @@ -101,7 +101,7 @@ post-install: .endfor .for i in ${CONFIG_FILES} ${CP} -np ${WWWDIR}/server/etc/${i}.DIST \ - ${WWWDIR}/server/etc/${i} + ${WWWDIR}/server/etc/${i} || ${TRUE} .endfor .include <bsd.port.mk> Modified: head/net/relayd/Makefile ============================================================================== --- head/net/relayd/Makefile Sat May 4 22:32:54 2013 (r317388) +++ head/net/relayd/Makefile Sat May 4 22:48:03 2013 (r317389) @@ -58,6 +58,6 @@ post-install: @${INSTALL_DATA} ${WRKSRC}/../etc/relayd.conf \ ${PREFIX}/etc/relayd.conf.sample @${CP} -n ${PREFIX}/etc/relayd.conf.sample \ - ${PREFIX}/etc/relayd.conf + ${PREFIX}/etc/relayd.conf || ${TRUE} .include <bsd.port.post.mk> Modified: head/net/ushare/Makefile ============================================================================== --- head/net/ushare/Makefile Sat May 4 22:32:54 2013 (r317388) +++ head/net/ushare/Makefile Sat May 4 22:48:03 2013 (r317389) @@ -42,6 +42,6 @@ do-install: post-install: ${CP} -np ${PREFIX}/etc/${PORTNAME}.conf.sample \ - ${PREFIX}/etc/${PORTNAME}.conf + ${PREFIX}/etc/${PORTNAME}.conf || ${TRUE} .include <bsd.port.mk> Modified: head/security/sancp/Makefile ============================================================================== --- head/security/sancp/Makefile Sat May 4 22:32:54 2013 (r317388) +++ head/security/sancp/Makefile Sat May 4 22:48:03 2013 (r317389) @@ -31,7 +31,7 @@ post-extract: do-install: @${INSTALL_PROGRAM} ${WRKSRC}/sancp ${PREFIX}/bin @${INSTALL_DATA} ${WRKSRC}/etc/sancp/sancp.conf ${PREFIX}/etc/sancp.conf-dist - @${CP} -n ${PREFIX}/etc/sancp.conf-dist ${PREFIX}/etc/sancp.conf + @${CP} -n ${PREFIX}/etc/sancp.conf-dist ${PREFIX}/etc/sancp.conf || ${TRUE} .if !defined(NOPORTDOCS) @${INSTALL} -d ${DOCSDIR}/ Modified: head/textproc/pootle/Makefile ============================================================================== --- head/textproc/pootle/Makefile Sat May 4 22:32:54 2013 (r317388) +++ head/textproc/pootle/Makefile Sat May 4 22:48:03 2013 (r317389) @@ -94,7 +94,7 @@ post-patch: post-install: @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${CP} -n ${PREFIX}/etc/pootle/localsettings.py.sample \ - ${PREFIX}/etc/pootle/localsettings.py + ${PREFIX}/etc/pootle/localsettings.py || ${TRUE} .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} Modified: head/www/c-icap-modules/Makefile ============================================================================== --- head/www/c-icap-modules/Makefile Sat May 4 22:32:54 2013 (r317388) +++ head/www/c-icap-modules/Makefile Sat May 4 22:48:03 2013 (r317389) @@ -2,7 +2,7 @@ # Date created: 15 August 2012 # Whom: Martin Matuska <mm@FreeBSD.org> # -# $FreeBSD: ports/www/c-icap-modules/Makefile,v 1.3 2012/08/15 01:47:11 mm Exp $ +# $FreeBSD$ # PORTNAME= c-icap @@ -33,8 +33,8 @@ CONFIGURE_ARGS+= --enable-static \ post-install: @${CP} -np ${PREFIX}/etc/c-icap/srv_url_check.conf.default \ - ${PREFIX}/etc/c-icap/srv_url_check.conf + ${PREFIX}/etc/c-icap/srv_url_check.conf || ${TRUE} @${CP} -np ${PREFIX}/etc/c-icap/virus_scan.conf.default \ - ${PREFIX}/etc/c-icap/virus_scan.conf + ${PREFIX}/etc/c-icap/virus_scan.conf || ${TRUE} .include <bsd.port.mk> Modified: head/www/c-icap/Makefile ============================================================================== --- head/www/c-icap/Makefile Sat May 4 22:32:54 2013 (r317388) +++ head/www/c-icap/Makefile Sat May 4 22:48:03 2013 (r317389) @@ -1,9 +1,5 @@ -# New ports collection makefile for: c-icap -# Date created: 30 January 2006 -# Whom: Elisey Savateev <b3k@mail.ru> -# +# Created by: Elisey Savateev <b3k@mail.ru> # $FreeBSD$ -# PORTNAME= c-icap PORTVERSION= 0.2.3 @@ -122,9 +118,9 @@ post-patch: post-install: @${CP} -np ${PREFIX}/etc/c-icap/c-icap.conf.default \ - ${PREFIX}/etc/c-icap/c-icap.conf + ${PREFIX}/etc/c-icap/c-icap.conf || ${TRUE} @${CP} -np ${PREFIX}/etc/c-icap/c-icap.magic.default \ - ${PREFIX}/etc/c-icap/c-icap.magic + ${PREFIX}/etc/c-icap/c-icap.magic || ${TRUE} @${SH} ${PKGINSTALL} ${PREFIX} POST-INSTALL .include <bsd.port.post.mk> Modified: head/x11/xdm/Makefile ============================================================================== --- head/x11/xdm/Makefile Sat May 4 22:32:54 2013 (r317388) +++ head/x11/xdm/Makefile Sat May 4 22:48:03 2013 (r317389) @@ -49,7 +49,7 @@ post-configure: post-install: .for f in ${CFFILES} - ${CP} -n ${EXAMPLESDIR}/$f ${PREFIX}/lib/X11/xdm/$f + ${CP} -n ${EXAMPLESDIR}/$f ${PREFIX}/lib/X11/xdm/$f || ${TRUE} .endfor ${MKDIR} /var/lib/xdm/authdir ${LN} -sf /var/lib/xdm/authdir ${PREFIX}/lib/X11/xdm/authdir
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305042248.r44Mm4Bx082743>