From f9d8d0eb8b943e13ae6190ba4dff0a542126c194 Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Wed, 4 Sep 2019 14:07:48 +0000
Subject: 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
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 1d7cda47390e..2c2b50258f70 100644
--- a/Makefile
+++ b/Makefile
@@ -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; \
-- 
cgit v1.2.3