Use sort with "modern" option

When building index we were using obsolete (but still supported options)
let use the non obsolete one.

PR:		166188
Submitted by:	lgfbsd@be-well.ilk.org
This commit is contained in:
Baptiste Daroussin 2019-09-04 14:07:48 +00:00
parent 9efc370e8f
commit f9d8d0eb8b
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=511095

View File

@ -77,7 +77,7 @@ fetchindex: ${INDEXDIR}/${INDEXFILE}.bz2
chmod a+r ${INDEXDIR}/${INDEXFILE} && ${RM} ${INDEXDIR}/${INDEXFILE}.bz2
${INDEXDIR}/${INDEXFILE}.bz2: .PHONY
@${FETCHINDEX} ${INDEXDIR}/${INDEXFILE}.bz2 ${MASTER_SITE_INDEX}${INDEXFILE}.bz2
${FETCHINDEX} ${INDEXDIR}/${INDEXFILE}.bz2 ${MASTER_SITE_INDEX}${INDEXFILE}.bz2
MASTER_SITE_INDEX?= https://www.FreeBSD.org/ports/
SETENV?= /usr/bin/env
@ -148,7 +148,7 @@ ${INDEXDIR}/${INDEXFILE}:
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 | \
sort -t '|' -k 2,3 | \
sed -Ee 's../.g' -e ':a' -e 's|/[^/]+/\.\.||; ta' \
-e 's|${PORTSDIR}|/usr/ports|g' \
-e 's|${.CURDIR}|/usr/ports|g' > ${INDEXDIR}/${INDEXFILE}.tmp; \