From 244b810f4fabfcd81bfe24401878975a4a3df4fd Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Tue, 28 Apr 2020 03:06:49 +0200
Subject: [PATCH] Framework: partially sync with upstream

Taken from: HardenedBSD
---
 MOVED          | 2 +-
 Mk/bsd.gcc.mk  | 6 +++++-
 Mk/bsd.port.mk | 6 +++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/MOVED b/MOVED
index ad2c485398bc..5d92a10c1adb 100644
--- a/MOVED
+++ b/MOVED
@@ -10538,7 +10538,6 @@ devel/rubygem-sidekiq-limit_fetch||2018-11-01|Obsolete by www/gitlab-ce 11.4.x u
 textproc/rubygem-github-markup16|textproc/rubygem-github-markup|2018-11-01|Obsolete by www/gitlab-ce 11.4.x upgrade, please use textproc/rubygem-github-markup
 www/rubygem-dropzonejs-rails07|www/rubygem-dropzonejs-rails|2018-11-01|Obsolete by www/gitlab-ce 11.4.x upgrade, please use www/rubygem-dropzonejs-rails
 audio/icecast2|audio/icecast|2018-11-03|Use upstream naming
-security/openssl-devel|security/openssl111|2018-11-04|Use security/openssl111 instead
 irc/netwalker-ircc||2018-11-04|Has expired: Upstream gone, very old code base, use modern irc client instead
 x11-toolkits/qt5-quick|x11-toolkits/qt5-declarative|2018-11-04|Remove unnecessary split
 lang/qt5-qml|x11-toolkits/qt5-declarative|2018-11-04|Remove unnecessary split
@@ -14550,3 +14549,4 @@ finance/py-ebaysdk-python|finance/py-ebaysdk|2020-04-21|Renamed to match Pypy pa
 emulators/qemu30|emulators/qemu31|2020-04-21|Has expired: No longer maintained by upstream
 editors/nano-devel||2020-04-23|Removed: Obsolete now, use editors/nano instead
 devel/py-liblarch||2020-04-25|Removed: uses deprecated version of python; no consumers left
+sysutils/DTraceToolkit|sysutils/dtrace-toolkit|2020-04-26|Renamed to match the package name
diff --git a/Mk/bsd.gcc.mk b/Mk/bsd.gcc.mk
index 276aa744e961..f09a050cafce 100644
--- a/Mk/bsd.gcc.mk
+++ b/Mk/bsd.gcc.mk
@@ -34,7 +34,7 @@ GCC_Include_MAINTAINER=		gerald@FreeBSD.org
 # All GCC versions supported by the ports framework.  Keep them in
 # ascending order and in sync with the table below. 
 # When updating this, keep Mk/bsd.default-versions.mk in sync.
-GCCVERSIONS=	4.8 7 8 9
+GCCVERSIONS=	4.8 7 8 9 10
 
 # No configurable parts below this. ####################################
 #
@@ -89,7 +89,11 @@ _USE_GCC:=	${GCC_DEFAULT}
 # A concrete version has been selected. Set proper ports dependencies,
 # CC, CXX, CPP, and flags.
 V:=			${_USE_GCC:S/.//}
+. if ${V} == 10
+_GCC_PORT:=		gcc${V}-devel
+. else
 _GCC_PORT:=		gcc${V}
+. endif
 CC:=			gcc${V}
 CXX:=			g++${V}
 CPP:=			cpp${V}
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 4b7cced95d94..dab5ce1480b3 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -803,7 +803,7 @@ FreeBSD_MAINTAINER=	portmgr@FreeBSD.org
 # MAKE_JOBS_NUMBER_LIMIT
 #				- Set a limit for maximum number of make jobs allowed to be
 #				  used.
-## cacche
+## ccache
 #
 # WITH_CCACHE_BUILD
 # 				- Enable CCACHE support (devel/ccache).  User settable.
@@ -1541,9 +1541,9 @@ DEV_ERROR+=		"FLAVORS contains flavors that are not all [a-z0-9_]: ${_BAD_FLAVOR
 
 .if !empty(FLAVOR)
 .  if empty(FLAVORS)
-IGNORE=	FLAVOR is defined (to ${FLAVOR}) while this port does not have FLAVORS.
+IGNORE=	FLAVOR is defined (to ${FLAVOR}) while this port does not have FLAVORS
 .  elif ! ${FLAVORS:M${FLAVOR}}
-IGNORE=	Unknown flavor '${FLAVOR}', possible flavors: ${FLAVORS}.
+IGNORE=	Unknown flavor '${FLAVOR}', possible flavors: ${FLAVORS}
 .  endif
 .endif