Date: Wed, 8 Oct 2014 06:06: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: r370414 - head/Mk Message-ID: <201410080606.s9866YAW072992@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Wed Oct 8 06:06:34 2014 New Revision: 370414 URL: https://svnweb.freebsd.org/changeset/ports/370414 QAT: https://qat.redports.org/buildarchive/r370414/ Log: Use absolute path for PORTDATA PORTDOCS and PORTEXAMPLES That makes them @cwd safe Modified: head/Mk/bsd.port.mk Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Wed Oct 8 05:54:33 2014 (r370413) +++ head/Mk/bsd.port.mk Wed Oct 8 06:06:34 2014 (r370414) @@ -5164,56 +5164,42 @@ ${TMPPLIST_SORT}: ${TMPPLIST} .if !target(add-plist-docs) .if defined(PORTDOCS) && !defined(NOPORTDOCS) add-plist-docs: - @if ${EGREP} -qe '^@cw?d' ${TMPPLIST} && \ - [ "`${SED} -En -e '/^@cw?d[ ]*/s,,,p' ${TMPPLIST} | ${TAIL} -n 1`" != "${PREFIX}" ]; then \ - ${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}; \ - fi .for x in ${PORTDOCS} @if ${ECHO_CMD} "${x}"| ${AWK} '$$1 ~ /(\*|\||\[|\]|\?|\{|\}|\$$)/ { exit 1};'; then \ if [ ! -e ${STAGEDIR}${DOCSDIR}/${x} ]; then \ - ${ECHO_CMD} ${DOCSDIR_REL}/${x} >> ${TMPPLIST}; \ + ${ECHO_CMD} ${DOCSDIR}/${x} >> ${TMPPLIST}; \ fi;fi .endfor @${FIND} -P ${PORTDOCS:S/^/${STAGEDIR}${DOCSDIR}\//} ! -type d 2>/dev/null | \ - ${SED} -ne 's,^${STAGEDIR}${PREFIX}/,,p' >> ${TMPPLIST} + ${SED} -ne 's,^${STAGEDIR},,p' >> ${TMPPLIST} .endif .endif .if !target(add-plist-examples) .if defined(PORTEXAMPLES) && !defined(NOPORTEXAMPLES) add-plist-examples: - @if ${EGREP} -qe '^@cw?d' ${TMPPLIST} && \ - [ "`${SED} -En -e '/^@cw?d[ ]*/s,,,p' ${TMPPLIST} | ${TAIL} -n 1`" != "${PREFIX}" ]; then \ - ${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}; \ - fi .for x in ${PORTEXAMPLES} @if ${ECHO_CMD} "${x}"| ${AWK} '$$1 ~ /(\*|\||\[|\]|\?|\{|\}|\$$)/ { exit 1};'; then \ if [ ! -e ${STAGEDIR}${EXAMPLESDIR}/${x} ]; then \ - ${ECHO_CMD} ${EXAMPLESDIR}/${x} | \ - ${SED} -e 's,^${PREFIX}/,,' >> ${TMPPLIST}; \ + ${ECHO_CMD} ${EXAMPLESDIR}/${x} >> ${TMPPLIST}; \ fi;fi .endfor @${FIND} -P ${PORTEXAMPLES:S/^/${STAGEDIR}${EXAMPLESDIR}\//} ! -type d 2>/dev/null | \ - ${SED} -ne 's,^${STAGEDIR}${PREFIX}/,,p' >> ${TMPPLIST} + ${SED} -ne 's,^${STAGEDIR},,p' >> ${TMPPLIST} .endif .endif .if !target(add-plist-data) .if defined(PORTDATA) add-plist-data: - @if ${EGREP} -qe '^@cw?d' ${TMPPLIST} && \ - [ "`${SED} -En -e '/^@cw?d[ ]*/s,,,p' ${TMPPLIST} | ${TAIL} -n 1`" != "${PREFIX}" ]; then \ - ${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}; \ - fi .for x in ${PORTDATA} @if ${ECHO_CMD} "${x}"| ${AWK} '$$1 ~ /(\*|\||\[|\]|\?|\{|\}|\$$)/ { exit 1};'; then \ if [ ! -e ${STAGEDIR}${DATADIR}/${x} ]; then \ - ${ECHO_CMD} ${DATADIR}/${x} | \ - ${SED} -e 's,^${PREFIX}/,,' >> ${TMPPLIST}; \ + ${ECHO_CMD} ${DATADIR}/${x} >> ${TMPPLIST}; \ fi;fi .endfor @${FIND} -P ${PORTDATA:S/^/${STAGEDIR}${DATADIR}\//} ! -type d 2>/dev/null | \ - ${SED} -ne 's,^${STAGEDIR}${PREFIX}/,,p' >> ${TMPPLIST} + ${SED} -ne 's,^${STAGEDIR},,p' >> ${TMPPLIST} .endif .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410080606.s9866YAW072992>