svn commit: r511095 - head

[Baptiste Daroussin]

Author: bapt
Date: Wed Sep  4 14:07:48 2019
New Revision: 511095
URL: https://svnweb.freebsd.org/changeset/ports/511095

Log:
  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 at be-well.ilk.org

Modified:
  head/Makefile

Modified: head/Makefile
==============================================================================
--- head/Makefile	Wed Sep  4 13:37:25 2019	(r511094)
+++ head/Makefile	Wed Sep  4 14:07:48 2019	(r511095)
@@ -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; \