Framework: partially sync with upstream

Taken from: FreeBSD
opnsense2 · Oct 18, 2021 · a5e9808 · a5e9808
1 parent 61882e3
commit a5e9808
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 9 deletions.
diff --git a/GIDs b/GIDs
@@ -237,7 +237,7 @@ krill:*:294:
 jottad:*:295:
 writefreely:*:296:
 conduit:*:297:
-# free: 298
+neolink:*:298:
 owncast:*:299:
 backuppc:*:300:
 # free: 301

diff --git a/MOVED b/MOVED
@@ -16542,3 +16542,4 @@ devel/geany-plugin-vc@gtk2|devel/geany-plugin-vc|2021-10-10|Project dropped GTK2
 devel/geany-plugin-vimode@gtk2|devel/geany-plugin-vimode|2021-10-10|Project dropped GTK2 support
 devel/geany-plugin-workbench@gtk2|devel/geany-plugin-workbench|2021-10-10|Project dropped GTK2 support
 devel/geany-plugin-xmlsnippets@gtk2|devel/geany-plugin-xmlsnippets|2021-10-10|Project dropped GTK2 support
+net-mgmt/unifi5|net-mgmt/unifi6|2021-10-16|Has expired: Use net-mgmt/unifi6 instead
diff --git a/Mk/Uses/compiler.mk b/Mk/Uses/compiler.mk
@@ -109,7 +109,7 @@ CHOSEN_COMPILER_TYPE=	${COMPILER_TYPE}
 
 .if ${_COMPILER_ARGS:Mnestedfct}
 .if ${COMPILER_TYPE} == clang
-USE_GCC=	any
+USE_GCC=	yes
 CHOSEN_COMPILER_TYPE=	gcc
 .endif
 .endif

diff --git a/Mk/Uses/kde.mk b/Mk/Uses/kde.mk
@@ -79,7 +79,7 @@ KDE_PLASMA_VERSION?=		5.23.0
 KDE_PLASMA_BRANCH?=		stable
 
 # Current KDE frameworks.
-KDE_FRAMEWORKS_VERSION?=	5.86.0
+KDE_FRAMEWORKS_VERSION?=	5.87.0
 KDE_FRAMEWORKS_BRANCH?= 	stable
 
 # Current KDE applications.

diff --git a/Mk/bsd.gcc.mk b/Mk/bsd.gcc.mk
@@ -21,9 +21,6 @@
 # If no arguments are specified, GCC is added as both a build dependency
 # and a run time dependency.
 #
-# (USE_GCC=any is deprecated - and now an odd way to write USE_GCC=yes.
-# Do *not* use! It will be removed shortly.)
-#
 #
 # Examples:
 #   USE_GCC=	yes			# port requires a current version of GCC
@@ -68,8 +65,8 @@ IGNORE=	bad target specification in USE_GCC; only "build" is supported
 
 .if defined(USE_GCC) && !defined(FORCE_BASE_CC_FOR_TESTING)
 
-# Handle USE_GCC=yes and USE_GCC=any.
-.if ${USE_GCC} == yes || ${USE_GCC} == any
+# Handle USE_GCC=yes.
+.if ${USE_GCC} == yes
 USE_GCC=	${GCC_DEFAULT}+
 .endif
 

diff --git a/UIDs b/UIDs
@@ -242,7 +242,7 @@ krill:*:294:294::0:0:krill Pseudo User:/nonexistent:/usr/sbin/nologin
 jottad:*:295:295::0:0:Jotta Cloud Daemon:/nonexisten:/usr/sbin/nologin
 writefreely:*:296:296::0:0:WriteFreely daemon:/var/db/writefreely:/usr/sbin/nologin
 conduit:*:297:297::0:0:Conduit daemon:/var/db/conduit:/usr/sbin/nologin
-# free: 298
+neolink:*:298:298::0:0:& daemon:/nonexistent:/usr/sbin/nologin
 owncast:*:299:299::0:0:& daemon:/nonexistent:/usr/sbin/nologin
 backuppc:*:300:300::0:0:BackupPC pseudo-user:/nonexistent:/usr/sbin/nologin
 # free: 301