Date: Sun, 27 Oct 2013 14:22:02 +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: r331775 - head Message-ID: <201310271422.r9REM22v096070@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Sun Oct 27 14:22:02 2013 New Revision: 331775 URL: http://svnweb.freebsd.org/changeset/ports/331775 Log: - Revert r329851 and again allow using portsnap's make_index by default, if available, for 'make index'. This removes the need to have perl installed. [1] - Fix output of the file to have the proper /usr/ports/ORIGIN regardless of real PORTSDIR or CURDIR [2] PR: ports/183095 [1] Submitted by: ak [2] With hat: portmgr Modified: head/Makefile Modified: head/Makefile ============================================================================== --- head/Makefile Sun Oct 27 14:10:27 2013 (r331774) +++ head/Makefile Sun Oct 27 14:22:02 2013 (r331775) @@ -105,11 +105,11 @@ INDEX_SHELL= /bin/sh INDEX_PORTS=. .endif -#.if exists(/usr/libexec/make_index) -#MAKE_INDEX= /usr/libexec/make_index /dev/stdin -#.else +.if exists(/usr/libexec/make_index) +MAKE_INDEX= /usr/libexec/make_index /dev/stdin +.else MAKE_INDEX= perl ${.CURDIR}/Tools/make_index -#.endif +.endif ${INDEXDIR}/${INDEXFILE}: @${INDEX_ECHO_1ST} "Generating ${INDEXFILE} - please wait.."; \ @@ -144,7 +144,8 @@ ${INDEXDIR}/${INDEXFILE}: cat $${tmpdir}/${INDEXFILE}.desc.* | (cd ${.CURDIR} ; ${MAKE_INDEX}) | \ sed -e 's/ */ /g' -e 's/| */|/g' -e 's/ *|/|/g' -e 's./..g' | \ sort -t '|' +1 -2 | \ - sed -e 's../.g' > ${INDEXDIR}/${INDEXFILE}.tmp; \ + sed -Ee 's../.g' -e ':a' -e 's|/[^/]+/\.\.||; ta' \ + -e 's|${.CURDIR}|/usr/ports|g' > ${INDEXDIR}/${INDEXFILE}.tmp; \ if [ "${INDEX_PRISTINE}" != "" ]; then \ sed -e "s,$${LOCALBASE},/usr/local," ${INDEXDIR}/${INDEXFILE}.tmp > ${INDEXDIR}/${INDEXFILE}; \ else \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310271422.r9REM22v096070>