From 9d30ec24afdec278b4694e4ee3e1611b28642b55 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 20 Jan 2021 12:12:22 +0100
Subject: [PATCH] Framework: sync with upstream

Taken from: HardenedBSD
---
 LEGAL                      | 2 +-
 MOVED                      | 2 ++
 Mk/Uses/kde.mk             | 2 +-
 Mk/Uses/pyqt.mk            | 2 +-
 Mk/bsd.default-versions.mk | 2 --
 Tools/scripts/tindex       | 7 ++++---
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/LEGAL b/LEGAL
index bff4b8a6202..1f273ef6378 100644
--- a/LEGAL
+++ b/LEGAL
@@ -116,7 +116,7 @@ jmf-*-alljava.zip	java/jmf		Redistribution of pre-compiled binaries is not permi
 jre-8*-i586.tar.gz	java/linux-oracle-jre18	License does not allow distribution with fee
 jta-*.zip		java/jta		See the license
 komodo-*		editors/komodo-edit	Distribution not permitted
-kzip-*			archivers/kzip		License does not allow redistribution
+kzip-*			archivers/kzip		License does not allow commercial redistribution
 l0phtcrack/*		security/l0phtcrack	Parts are under GPL, so binaries should not be distributed.  Contains crypto code from OpenSSL
 ladder.tar		games/ladder		Possible copyright problems
 lha-1.14i-ac*		archivers/lha-ac	No redistribution allowed
diff --git a/MOVED b/MOVED
index e68dce49ab3..97daa7eb11d 100644
--- a/MOVED
+++ b/MOVED
@@ -16019,3 +16019,5 @@ lang/harbour||2021-01-15|BROKEN, needs ancient version of openssl, upstream will
 net-im/telegram|net-im/telegram-cli|2021-01-17|Has expired: Upstream unmaintained; please migrate to net-im/telegram-cli
 science/dlpoly-classic||2021-01-17|Has expired: MASTERSITE gone; possibly replaced by https://gitlab.com/DL_POLY_Classic/dl_poly ?
 security/py-gtts-token|audio/py-gtts|2021-01-17|Has expired: Obsolete, please use audio/py-gtts instead
+graphics/qt-avif-image-plugin|graphics/kf5-kimageformats|2021-01-18|Part of kimageformats since KDE Frameworks 5.78.0
+archivers/libunrar5|archivers/libunrar6|2021-01-19|Renamed to match current major version of libunrar
diff --git a/Mk/Uses/kde.mk b/Mk/Uses/kde.mk
index cc8307acefa..83af7032567 100644
--- a/Mk/Uses/kde.mk
+++ b/Mk/Uses/kde.mk
@@ -58,7 +58,7 @@ KDE_PLASMA_VERSION?=		5.20.5
 KDE_PLASMA_BRANCH?=		stable
 
 # Current KDE frameworks.
-KDE_FRAMEWORKS_VERSION?=	5.77.0
+KDE_FRAMEWORKS_VERSION?=	5.78.0
 KDE_FRAMEWORKS_BRANCH?= 	stable
 
 # Current KDE applications.
diff --git a/Mk/Uses/pyqt.mk b/Mk/Uses/pyqt.mk
index 969d9a3e94f..79df63b6746 100644
--- a/Mk/Uses/pyqt.mk
+++ b/Mk/Uses/pyqt.mk
@@ -64,7 +64,7 @@ MASTER_SITES_QSCI2=	RIVERBANK/QScintilla/${PORTVERSION} \
 			GENTOO
 
 SIP_VERSION=		5.5.0
-QSCI2_VERSION=		2.11.5
+QSCI2_VERSION=		2.11.6
 PYQT5_VERSION=		5.15.2
 PYQTSIP_VERSION=	12.8.1
 PYQTBUILDER_VERSION=	1.6.0
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index 5641c8ea5ef..d2f57b58e9e 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -50,8 +50,6 @@ FPC_DEFAULT?=		3.2.0
 # Possible values: 8, 9 (powerpcspe was dropped with GCC 9), 10
 .if ${ARCH} == "powerpcspe"
 GCC_DEFAULT?=		8
-.elif ${ARCH} == "powerpc64le"
-GCC_DEFAULT?=		10
 .else
 GCC_DEFAULT?=		10
 .endif
diff --git a/Tools/scripts/tindex b/Tools/scripts/tindex
index c9679bbdd2f..5aaf71cce95 100755
--- a/Tools/scripts/tindex
+++ b/Tools/scripts/tindex
@@ -15,6 +15,7 @@
 # --------------------------------------------------------
 # Change these!
 
+GIT=/usr/local/bin/git
 SVN=/usr/local/bin/svn
 
 # Address for success/failure reports
@@ -34,6 +35,7 @@ export OUTDIR=${BASEDIR}/out
 # Target architecture if not set in the environment
 if [ "${ARCH}" = "" ]; then
 	export ARCH=i386
+	export MACHINE_ARCH=i386
 fi
 
 # --------------------------------------------------------
@@ -120,9 +122,8 @@ OSVERSION11=$(awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < ${SRCDIR
 ${SVN} -q up ${SRCDIR12}/sys/sys
 OSVERSION12=$(awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < ${SRCDIR12}/sys/sys/param.h)
 
-${SVN} -q up ${SRCDIR13}/sys/sys
-OSVERSION13=$(awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < ${SRCDIR12}/sys/sys/param.h)
-
+${GIT} -C ${SRCDIR13} pull --rebase -q
+OSVERSION13=$(awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < ${SRCDIR13}/sys/sys/param.h)
 
 cd ${PORTSDIR}
 rm -f INDEX-11 INDEX-11.bz2 INDEX-12 INDEX-12.bz2 INDEX-13 INDEX-13.bz2