Framework: sync with upstream

Taken from: HardenedBSD

MOVED

@@ -16290,3 +16290,6 @@ www/grafana4|www/grafana6|2021-04-17|Has expired: Upstream end of life
 www/grafana5|www/grafana6|2021-04-17|Has expired: Upstream end of life
 comms/py-lirc||2021-04-17|Has expired: No longer maintained and not compatible with Python 3
 x11-toolkits/qt5-gtkplatform||2021-04-17|Has expired: Archived upstream
+textproc/py-markdown3|textproc/py-markdown|2021-04-20|markdown3 confilicts with too many ports
+security/fbopenssl||2021-04-20|Unmaintained, abandoned, does not build with recent OS versions
+devel/gearmand-devel||2021-04-20|Unmaintained, abandoned, has not built for over half a year

Mk/Uses/kde.mk

@@ -155,9 +155,14 @@ MASTER_SITES?=		KDE/${KDE_APPLICATIONS_BRANCH}/applications/${KDE_APPLICATIONS_V
 MASTER_SITES?=		KDE/${KDE_APPLICATIONS_BRANCH}/release-service/${KDE_APPLICATIONS_VERSION}/src
 # Let bsd.port.mk create the plist-entries for the documentation.
 # KDE Applications ports install their documentation to
-# ${PREFIX}/share/doc.
+# ${PREFIX}/share/doc. This is only done if the port
+# defines OPTION DOCS -- the _KDE_OPTIONS here is to
+# avoid make errors when there are no options defined at all.
+_KDE_OPTIONS=		bogus ${OPTIONS_DEFINE}
+.          if ${_KDE_OPTIONS:MDOCS}
 DOCSDIR=		${PREFIX}/share/doc
 PORTDOCS?=		HTML/*
+.          endif
 # Further pass along a SHLIB_VER PLIST_SUB
 PLIST_SUB+=		KDE_APPLICATIONS_SHLIB_VER=${KDE_APPLICATIONS_SHLIB_VER} \
 			KDE_APPLICATIONS_VERSION_SHORT="${KDE_APPLICATIONS_VERSION:R:R}"

Mk/Uses/meson.mk

@@ -36,6 +36,11 @@ CONFIGURE_ARGS+=	--prefix ${PREFIX} \
 			--mandir man \
 			--infodir ${INFO_PATH}
 
+# Disable color output.  Meson forces it on by default, Ninja
+# strips it before it goes to the log, but Samurai does not, so we
+# might end up with ANSI escape sequences in the logs.
+CONFIGURE_ARGS+=	-Db_colorout=never
+
 # meson has it own strip mechanic
 INSTALL_TARGET=		install
 

Mk/Uses/ninja.mk

@@ -2,26 +2,77 @@
 #
 # Feature:		ninja
 # Usage:		USES=ninja
+# Valid ARGS:		build, make (default), run
+#
+# build			add a build dependency on ninja
+# make			use ninja for the build instead of make, implies "build"
+# run			add a run dependency on ninja
 #
 # MAINTAINER: portmgr@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_NINJA_MK)
 _INCLUDE_USES_NINJA_MK=	yes
 
-.if !empty(ninja_ARGS)
-IGNORE=	Incorrect 'USES+= ninja:${ninja_ARGS}' ninja takes no arguments
+_valid_ARGS=	build make run
+
+.for _arg in ${ninja_ARGS}
+.    if empty(_valid_ARGS:M${_arg})
+IGNORE=	'USES+= ninja:${ninja_ARGS}' usage: argument [${_arg}] is not recognized
+.    endif
+.endfor
+
+.if empty(ninja_ARGS)
+ninja_ARGS+=	make
 .endif
 
+.if ${ninja_ARGS:Mmake}
+ninja_ARGS+=	build
+.endif
+
+.if ${NINJA_DEFAULT} == ninja
+NINJA_CMD=	ninja
+_NINJA_PORT=	devel/ninja
+.elif ${NINJA_DEFAULT} == samurai
+NINJA_CMD=	samu
+_NINJA_PORT=	devel/samurai
+MAKE_ENV+=	SAMUFLAGS="-v -j${MAKE_JOBS_NUMBER}"
+.  if ${ninja_ARGS:Mbuild} && !${BINARY_ALIAS:U:Mninja=*}
+# Cmake and Meson have native support for Samurai and detect and
+# use it when Ninja is not available in the build environment.  The
+# alias is needed for other ports which call Ninja directly and do
+# not fall back to Samurai. There should be no harm in providing it
+# generally.
+BINARY_ALIAS+=	ninja=samu
+.  endif
+.else
+IGNORE=	invalid DEFAULT_VERSIONS+=ninja=${NINJA_DEFAULT}
+.endif
+
+.if ${ninja_ARGS:Mbuild}
+BUILD_DEPENDS+=	${NINJA_CMD}:${_NINJA_PORT}
+# Humanize build log and include percentage of completed jobs %p in it.
+# See samu(1) or the Ninja manual.
+MAKE_ENV+=	NINJA_STATUS="[%p %s/%t] "
+.endif
+
+.if ${ninja_ARGS:Mmake}
+.  if ${NINJA_DEFAULT} == ninja
+# samu does not support GNU-style args, so we cannot just append
+# -v last.  samu gets this via SAMUFLAGS above but ninja does not
+# support an equivalent environment variable.
 MAKE_ARGS+=	-v
-
-BUILD_DEPENDS+=	ninja:devel/ninja
-
+.  endif
 CMAKE_ARGS+=	-GNinja
 MAKEFILE=
-MAKE_CMD=	ninja
+MAKE_CMD=	${NINJA_CMD}
 MAKE_FLAGS=
 # Set a minimal job of 1
 _MAKE_JOBS=	-j${MAKE_JOBS_NUMBER}
 _DESTDIR_VIA_ENV=	yes
+.endif
+
+.if ${ninja_ARGS:Mrun}
+RUN_DEPENDS+=	${NINJA_CMD}:${_NINJA_PORT}
+.endif
 
 .endif

Mk/bsd.default-versions.mk

@@ -18,7 +18,7 @@ _INCLUDE_BSD_DEFAULT_VERSIONS_MK=	yes
 LOCALBASE?=	/usr/local
 
 .for lang in APACHE BDB COROSYNC EMACS FIREBIRD FORTRAN FPC GCC GHOSTSCRIPT \
-	IMAGEMAGICK JAVA LAZARUS LIBRSVG2 LINUX LLVM LUA MYSQL PERL5 \
+	IMAGEMAGICK JAVA LAZARUS LIBRSVG2 LINUX LLVM LUA MYSQL NINJA PERL5 \
 	PGSQL PHP PYTHON PYTHON2 PYTHON3 RUBY RUST SAMBA SSL TCLTK VARNISH
 .if defined(${lang}_DEFAULT)
 ERROR+=	"The variable ${lang}_DEFAULT is set and it should only be defined through DEFAULT_VERSIONS+=${lang:tl}=${${lang}_DEFAULT} in /etc/make.conf"
@@ -81,6 +81,8 @@ LUA_DEFAULT?=		5.2
 MONO_DEFAULT=		5.10
 # Possible values: 5.5, 5.6, 5.7, 8.0, 10.3m, 10.4m, 10.5m, 5.5p, 5.6p, 5.7p, 5.6w, 5.7w
 MYSQL_DEFAULT?=		5.7
+# Possible values: ninja, samurai
+NINJA_DEFAULT?=		ninja
 # Possible values: 5.28, 5.30, 5.32, devel
 .if !exists(${LOCALBASE}/bin/perl) || (!defined(_PORTS_ENV_CHECK) && \
     defined(PACKAGE_BUILDING))

UPDATING

@@ -5,6 +5,17 @@ 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.
 
+20210420:
+  AFFECTS: users of www/node
+  AUTHOR: bhughes@FreeBSD.org
+
+  The www/node port has been updated to Node.js v16.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/v16.0.0/
+
 20210416:
   AFFECTS: Users of shells/bash, shells/bash-static with PORTS_READLINE=off
   AUTHOR: olce.freebsd@certner.fr