Date: Fri, 6 Dec 2013 18:45:13 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r335781 - head Message-ID: <201312061845.rB6IjDjM080571@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Fri Dec 6 18:45:13 2013 New Revision: 335781 URL: http://svnweb.freebsd.org/changeset/ports/335781 Log: - Fix 'make index' not working when PORTSDIR is a symlink to another directory PR: ports/183431 Submitted by: Yasuhiro KIMURA <yasu@utahime.org> (based on) Modified: head/Makefile Modified: head/Makefile ============================================================================== --- head/Makefile Fri Dec 6 17:43:18 2013 (r335780) +++ head/Makefile Fri Dec 6 18:45:13 2013 (r335781) @@ -141,10 +141,13 @@ ${INDEXDIR}/${INDEXFILE}: echo; \ fi; \ exit 1); \ - cat $${tmpdir}/${INDEXFILE}.desc.* | (cd ${.CURDIR} ; ${MAKE_INDEX}) | \ + cat $${tmpdir}/${INDEXFILE}.desc.* | \ + sed -e 's|${.CURDIR}|${PORTSDIR}|g' | \ + (cd ${.CURDIR} ; ${MAKE_INDEX}) | \ sed -e 's/ */ /g' -e 's/| */|/g' -e 's/ *|/|/g' -e 's./..g' | \ sort -t '|' +1 -2 | \ sed -Ee 's../.g' -e ':a' -e 's|/[^/]+/\.\.||; ta' \ + -e 's|${PORTSDIR}|/usr/ports|g' \ -e 's|${.CURDIR}|/usr/ports|g' > ${INDEXDIR}/${INDEXFILE}.tmp; \ if [ "${INDEX_PRISTINE}" != "" ]; then \ sed -e "s,$${LOCALBASE},/usr/local," ${INDEXDIR}/${INDEXFILE}.tmp > ${INDEXDIR}/${INDEXFILE}; \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312061845.rB6IjDjM080571>