Date: Wed, 8 Oct 2014 05:54:34 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r370413 - head/Mk Message-ID: <201410080554.s985sYVY067909@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Wed Oct 8 05:54:33 2014 New Revision: 370413 URL: https://svnweb.freebsd.org/changeset/ports/370413 QAT: https://qat.redports.org/buildarchive/r370413/ Log: Use absolute patch for rc scripts in plist That avoids playing with @cwd Modified: head/Mk/bsd.port.mk Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Wed Oct 8 05:52:17 2014 (r370412) +++ head/Mk/bsd.port.mk Wed Oct 8 05:54:33 2014 (r370413) @@ -5248,19 +5248,16 @@ add-plist-post: install-rc-script: .if defined(USE_RCORDER) @${ECHO_MSG} "===> Staging early rc.d startup script(s)" - @${ECHO_CMD} "@cwd /" >> ${TMPPLIST} @for i in ${USE_RCORDER}; do \ ${INSTALL_SCRIPT} ${WRKDIR}/$${i} ${STAGEDIR}/etc/rc.d/$${i%.sh}; \ - ${ECHO_CMD} "etc/rc.d/$${i%.sh}" >> ${TMPPLIST}; \ + ${ECHO_CMD} "/etc/rc.d/$${i%.sh}" >> ${TMPPLIST}; \ done - @${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST} .endif .if defined(USE_RC_SUBR) && ${USE_RC_SUBR:tu} != "YES" @${ECHO_MSG} "===> Staging rc.d startup script(s)" - @${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST} @for i in ${USE_RC_SUBR}; do \ ${INSTALL_SCRIPT} ${WRKDIR}/$${i} ${STAGEDIR}${PREFIX}/etc/rc.d/$${i%.sh}; \ - ${ECHO_CMD} "etc/rc.d/$${i%.sh}" >> ${TMPPLIST}; \ + ${ECHO_CMD} "${PREFIX}/etc/rc.d/$${i%.sh}" >> ${TMPPLIST}; \ done .endif .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410080554.s985sYVY067909>