From a6f3a12f0c15503fd34e9fb932dbfcc27180552f Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 15 Jun 2020 05:13:20 +0200
Subject: [PATCH] Framework: partially sync with upstream

Taken from: HardenedBSD
---
 MOVED              |  6 ++++++
 Mk/Uses/ada.mk     | 14 ++------------
 Mk/Uses/kde.mk     |  4 ++--
 Tools/scripts/psvn |  2 +-
 UPDATING           | 24 ++++++++++++++++++++++++
 5 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/MOVED b/MOVED
index baa66407597..bdf2a48b928 100644
--- a/MOVED
+++ b/MOVED
@@ -15080,3 +15080,9 @@ sysutils/beats|sysutils/beats6|2020-06-07|Renamed to match the naming of other E
 security/pam_pseudo||2020-06-07|Has expired: Broken for more than 6 months
 multimedia/din|audio/din|2020-06-09|Moved to a better category
 www/py-dj22-django_csp|www/py-django-csp|2020-06-10|Renamed to match upstream naming and to be in sync with other Django ports since Django 2.2 became default
+www/py-dj22-django-jquery-js|www/py-django-jquery-js|2020-06-11|Renamed to match the naming of other Django ports since Django 2.2 became default
+www/py-dj22-django-formset-js-improved|www/py-django-formset-js-improved|2020-06-11|Renamed to match the naming of other Django ports since Django 2.2 became default
+mail/claws-mail-archiver|mail/claws-mail-archive|2020-06-11|Renamed to align port name to plugin name
+mail/claws-mail-attach_warner|mail/claws-mail-attachwarner|2020-06-11|Renamed to align port name to plugin name
+mail/claws-mail-spamreport|mail/claws-mail-spam_report|2020-06-11|Renamed to align port name to plugin name
+mail/claws-mail-tnef|mail/claws-mail-tnef_parse|2020-06-11|Renamed to align port name to plugin name
diff --git a/Mk/Uses/ada.mk b/Mk/Uses/ada.mk
index 0ade2e689ed..8b137461fef 100644
--- a/Mk/Uses/ada.mk
+++ b/Mk/Uses/ada.mk
@@ -1,11 +1,11 @@
 # $FreeBSD$
 #
 # Establish Ada-capable compiler as a build dependency
-# To change default compiler, define ADA_DEFAULT in make.conf to 5
+# To change default compiler, define ADA_DEFAULT in make.conf
 #
 # Feature:      ada
 # Usage:        USES=ada
-# Valid ARGS:   5, 6, run
+# Valid ARGS:   run
 #
 # MAINTAINER: ports@FreeBSD.org
 
@@ -15,16 +15,6 @@ _INCLUDE_USES_ADA_MK=    yes
 CC=	ada
 ADAXX=	gcc6	# framework default
 
-. if ${ada_ARGS:M5}
-ADAXX=	gcc5
-. elif ${ada_ARGS:M6}
-ADAXX=	gcc6
-. elif defined(ADA_DEFAULT)
-.  if ${ADA_DEFAULT} == 5
-ADAXX=	gcc5
-.  endif
-. endif
-
 . if ${ada_ARGS:Mrun}
 RUN_DEPENDS+=	${LOCALBASE}/${ADAXX}-aux/bin/ada:lang/${ADAXX}-aux
 . endif
diff --git a/Mk/Uses/kde.mk b/Mk/Uses/kde.mk
index 131c4902de0..1efae27a9aa 100644
--- a/Mk/Uses/kde.mk
+++ b/Mk/Uses/kde.mk
@@ -62,8 +62,8 @@ KDE_FRAMEWORKS_VERSION?=	5.70.0
 KDE_FRAMEWORKS_BRANCH?= 	stable
 
 # Current KDE applications.
-KDE_APPLICATIONS_VERSION?=	20.04.1
-KDE_APPLICATIONS_SHLIB_VER?=	5.14.1
+KDE_APPLICATIONS_VERSION?=	20.04.2
+KDE_APPLICATIONS_SHLIB_VER?=	5.14.2
 KDE_APPLICATIONS_BRANCH?=	stable
 # Upstream moves old software to Attic/. Specify the newest applications release there.
 # Only the major version is used for the comparison.
diff --git a/Tools/scripts/psvn b/Tools/scripts/psvn
index 0e58dbef6b0..74368cdbd45 100755
--- a/Tools/scripts/psvn
+++ b/Tools/scripts/psvn
@@ -141,7 +141,7 @@ getfilequotedarray() {
 	varname="$1"
 	shift
 	IFS="$LF"
-	set -- $("${SVN}" status -- "$@" | sed 's/^....... //')
+	set -- $("${SVN}" status -- "$@" | grep -v '^       ' | sed 's/^....... //')
 	eval "$varname=\$(savearray "\$@")"
 }
 
diff --git a/UPDATING b/UPDATING
index 200cd3a424c..fcd842f5b6d 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,30 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+
+20200613:
+  AFFECTS: users of editors/libreoffice
+  AUTHOR: fluffy@FreeBSD.org
+
+  LibreOffice was updated to 6.4 branch with some critical changes:
+  - GTK2 option is obsolete by upstream
+  - GTK3 option is not more set by default because of unstable yet and have visual glitches
+  - QT5 option is set by default to provide comfy visual style for every user
+  - KDE option was renamed to KF5 follows upstream
+
+  Please re-run "make config" to pick up the new defaults
+
+20200610:
+  AFFECTS: users of www/node
+  AUTHOR: bhughes@FreeBSD.org
+
+  The www/node port has been updated to Node.js v14.0.0, the latest
+  upstream release. This is a major release, including many significant
+  changes. Users are encouraged to read the release announcements before
+  upgrading:
+
+  https://nodejs.org/en/blog/release/v14.0.0/
+
 20200602:
   AFFECTS: users of www/radicale
   AUTHOR: decke@FreeBSD.org