diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index 5a04cbdb9625..aa777f354a8d 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -1,184 +1,184 @@
 # MAINTAINER:	ports@FreeBSD.org
 #
 # Note: before committing to this file, contact portmgr to arrange for an
 # experimental ports run.  Untested commits may be backed out at portmgr's
 # discretion.
 #
 # Provide default versions for ports with multiple versions selectable
 # by the user.
 #
 # Users who want to override these defaults can easily do so by defining
 # DEFAULT_VERSIONS in their make.conf as follows:
 #
 #   DEFAULT_VERSIONS=	perl5=5.20 ruby=3.1
 
 .if !defined(_INCLUDE_BSD_DEFAULT_VERSIONS_MK)
 _INCLUDE_BSD_DEFAULT_VERSIONS_MK=	yes
 
 LOCALBASE?=	/usr/local
 
 .  for lang in APACHE BDB COROSYNC EMACS FIREBIRD FORTRAN FPC GCC \
 	GHOSTSCRIPT GL GO GUILE IMAGEMAGICK JAVA LAZARUS LIBRSVG2 LINUX LLVM \
 	LUA LUAJIT MONO MYSQL NINJA NODEJS OPENLDAP PERL5 PGSQL PHP \
 	PYCRYPTOGRAPHY 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"
 .    endif
 #.undef ${lang}_DEFAULT
 .  endfor
 
 .  for lang in ${DEFAULT_VERSIONS}
 _l=		${lang:C/=.*//g}
 ${_l:tu}_DEFAULT=	${lang:C/.*=//g}
 .  endfor
 
 # Possible values: 2.4
 APACHE_DEFAULT?=	2.4
 # Possible values: 5, 18
 BDB_DEFAULT?=		5
 # Possible values: 2, 3
 COROSYNC_DEFAULT?=	2
 # Possible_values: full canna nox devel_full devel_nox
 #EMACS_DEFAULT?=	let the flavor be the default if not explicitly set
 # Possible values: 3.0, 4.0
 FIREBIRD_DEFAULT?=	3.0
 # Possible values: gfortran
 FORTRAN_DEFAULT?=	gfortran
 # Possible values: 3.2.2
 FPC_DEFAULT?=		3.2.2
 # Possible values: 8 (last to support powerpcspe), 9, 10, 11, 12
 # (Any other version is completely unsupported and not meant for general use.)
 .  if ${ARCH} == "powerpcspe"
 GCC_DEFAULT?=		8
 .  else
 GCC_DEFAULT?=		12
 .  endif
 # Possible values: 9, agpl, 10
 GHOSTSCRIPT_DEFAULT?=	agpl
 # Possible values: mesa-libs, mesa-devel
 GL_DEFAULT?=		mesa-libs
 # Possible values: 1.19, 1.20, 1.21-devel
 GO_DEFAULT?=		1.20
 # Possible values: 1.8, 2.2, 3.0
 GUILE_DEFAULT?=		2.2
 # Possible versions: 6, 7
 # Possible flavors:  x11, nox11
 #                    (defaults to x11 when not specified)
 # Format:	     version[-flavor]
 # Examples:	     6-nox11, 7
 IMAGEMAGICK_DEFAULT?=	7
 # Possible values: 8, 11, 17, 18
 JAVA_DEFAULT?=		8
 # Possible values: 2.2.6, 2.3.0
 .  if !defined(WANT_LAZARUS_DEVEL)
 LAZARUS_DEFAULT?=	2.2.6
 .  else
 LAZARUS_DEFAULT?=	2.3.0
 .  endif
 # Possible values: rust, legacy
 .  if empty(ARCH:Naarch64:Namd64:Narmv7:Ni386:Npowerpc64:Npowerpc64le:Npowerpc:Nriscv64)
 LIBRSVG2_DEFAULT?=	rust
 .  else
 LIBRSVG2_DEFAULT?=	legacy
 .  endif
 # Possible values: c7
 LINUX_DEFAULT?=		c7
 # Possible values: 10, 11, 12, 13, 14, 15, -devel (to be used when non-base compiler is required)
 LLVM_DEFAULT?=		15
 # Possible values: 5.1, 5.2, 5.3, 5.4
 LUA_DEFAULT?=		5.4
 # Possible values: luajit, luajit-devel, luajit-openresty
 .  if ${ARCH:Mpowerpc64*}
 LUAJIT_DEFAULT?=	luajit-openresty
 .  else
 LUAJIT_DEFAULT?=	luajit-devel
 .  endif
 # Possible values: 5.10, 5.20, 6.8
-MONO_DEFAULT?=		5.10
+MONO_DEFAULT?=		5.20
 # Possible values: 5.7, 8.0, 10.5m, 10.6m, 10.11m, 5.7p, 5.7w
 MYSQL_DEFAULT?=		8.0
 # Possible values: ninja, samurai
 NINJA_DEFAULT?=		ninja
 # Possible value: 16, 18, 20, current, lts (Note: current = 20 and lts = 18)
 NODEJS_DEFAULT?=	lts
 # Possible value: 24, 25, 26
 OPENLDAP_DEFAULT?=	26
 # Possible values: 5.32, 5.34, 5.36, 5.38, devel
 .  if !exists(${LOCALBASE}/bin/perl) || (!defined(_PORTS_ENV_CHECK) && \
     defined(PACKAGE_BUILDING))
 PERL5_DEFAULT?=		5.34
 .  elif !defined(PERL5_DEFAULT)
 # There's no need to replace development versions, like "5.23" with "devel"
 # because 1) nobody is supposed to use it outside of poudriere, and 2) it must
 # be set manually in /etc/make.conf in the first place, and we're never getting
 # in here.
 .    if !defined(_PERL5_FROM_BIN)
 _PERL5_FROM_BIN!=	${LOCALBASE}/bin/perl -e 'printf "%vd\n", $$^V;'
 .    endif
 _EXPORTED_VARS+=	_PERL5_FROM_BIN
 PERL5_DEFAULT:=		${_PERL5_FROM_BIN:R}
 .  endif
 # Possible values: 11, 12, 13, 14, 15
 PGSQL_DEFAULT?=		13
 # Possible values: 8.0, 8.1, 8.2, 8.3
 PHP_DEFAULT?=		8.1
 # Possible values: rust, legacy
 .  if empty(ARCH:Naarch64:Namd64:Narmv7:Ni386:Npowerpc64:Npowerpc64le:Npowerpc:Nriscv64)
 PYCRYPTOGRAPHY_DEFAULT?=	rust
 .  else
 PYCRYPTOGRAPHY_DEFAULT?=	legacy
 .  endif
 # Possible values: 2.7, 3.8, 3.9, 3.10, 3.11
 PYTHON_DEFAULT?=	3.9
 # Possible values: 2.7
 PYTHON2_DEFAULT?=	2.7
 # Possible values: 3.8, 3.9, 3.10, 3.11
 PYTHON3_DEFAULT?=	3.9
 # Possible values: 3.0, 3.1, 3.2, 3.3
 RUBY_DEFAULT?=		3.1
 # Possible values: rust, rust-nightly
 RUST_DEFAULT?=		rust
 # Possible values: 4.13, 4.16
 SAMBA_DEFAULT?=		4.13
 # Possible values: base, openssl, libressl, libressl-devel
 .  if !defined(SSL_DEFAULT)
 #	If no preference was set, check for an installed base version
 #	but give an installed port preference over it.
 .    if	!defined(SSL_DEFAULT) && \
 	!exists(${DESTDIR}/${LOCALBASE}/lib/libcrypto.so) && \
 	exists(${DESTDIR}/usr/include/openssl/opensslv.h)
 SSL_DEFAULT=	base
 .    else
 .      if exists(${DESTDIR}/${LOCALBASE}/lib/libcrypto.so)
 .        if defined(PKG_BIN)
 # find installed port and use it for dependency
 .          if !defined(OPENSSL_INSTALLED)
 .            if defined(DESTDIR)
 PKGARGS=	-c ${DESTDIR}
 .            else
 PKGARGS=
 .            endif
 OPENSSL_INSTALLED!=	${PKG_BIN} ${PKGARGS} which -qo ${LOCALBASE}/lib/libcrypto.so || :
 .          endif
 .          if defined(OPENSSL_INSTALLED) && !empty(OPENSSL_INSTALLED)
 SSL_DEFAULT:=		${OPENSSL_INSTALLED:T}
 WARNING+=	"You have ${OPENSSL_INSTALLED} installed but do not have DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT} set in your make.conf"
 .          endif
 .        else
 check-makevars::
 	@${ECHO_MSG} "You have a ${LOCALBASE}/lib/libcrypto.so file installed, but the framework is unable"
 	@${ECHO_MSG} "to determine what port it comes from."
 	@${ECHO_MSG} "Add DEFAULT_VERSIONS+=ssl=<openssl package name> to your /etc/make.conf and try again."
 	@${FALSE}
 .        endif
 .      endif
 .    endif
 # Make sure we have a default in the end
 SSL_DEFAULT?=	base
 .  endif
 # Possible values: 8.5, 8.6, 8.7
 TCLTK_DEFAULT?=		8.6
 # Possible values: 6, 7
 VARNISH_DEFAULT?=	6
 
 .endif
diff --git a/devel/dbus-sharp/Makefile b/devel/dbus-sharp/Makefile
index b266d783624d..443345beb47f 100644
--- a/devel/dbus-sharp/Makefile
+++ b/devel/dbus-sharp/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	dbus-sharp
 PORTVERSION=	0.8.1
 DISTVERSIONPREFIX=v
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	devel gnome
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mono interface to the D-BUS messaging system
 WWW=		http://mono.github.com/dbus-sharp/
 
 LICENSE=	MIT
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_path_GMCS=${LOCALBASE}/bin/mcs
 USES=		autoreconf gmake mono pathfix pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	mono
 
 .include <bsd.port.pre.mk>
 
 .if defined(MONO_DEFAULT) && ${MONO_DEFAULT} > 6
 BROKEN=		fails to build with Mono version ${MONO_DEFAULT}: Failure adding assembly dbus-sharp.dll to the cache: Strong name cannot be verified for delay-signed assembly
 .endif
 
 post-patch:
 # libc.so is an LD script not usable by dllmap, so we have to set a proper
 # version number.
 	@${REINPLACE_CMD} -e 's|libc.so.6|libc.so.7|' \
 		${WRKSRC}/src/dbus-sharp.dll.config
 
 .include <bsd.port.post.mk>
diff --git a/devel/log4net/Makefile b/devel/log4net/Makefile
index ffdb9f36c5ae..d19bb3624f06 100644
--- a/devel/log4net/Makefile
+++ b/devel/log4net/Makefile
@@ -1,42 +1,42 @@
 PORTNAME=	log4net
 PORTVERSION=	1.2.10
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=	https://archive.apache.org/dist/incubator/${PORTNAME}/${PORTVERSION}/
 DISTNAME=	incubating-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Port for .NET of the Apache Logging Services project
 WWW=		https://logging.apache.org/log4net/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USES=		cpe mono zip
 CPE_VENDOR=	apache
 NO_BUILD=	yes
 NO_ARCH=	yes
 SUB_FILES=	log4net.pc
 SUB_LIST=	PORTVERSION=${PORTVERSION}
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 do-install:
 	@(cd ${INSTALL_WRKSRC}/bin/mono/2.0/release && ${SETENV} MONO_SHARED_DIR=${WRKDIR} ${LOCALBASE}/bin/gacutil /root ${STAGEDIR}${PREFIX}/lib/ /gacdir ${STAGEDIR}${PREFIX}/lib /package 2.0 /i log4net.dll)
 	${INSTALL_DATA} ${WRKDIR}/log4net.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/log4net.pc
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 
 do-install-EXAMPLES-on:
 	@${ECHO_CMD} "Installing examples..."
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/mono-addins/Makefile b/devel/mono-addins/Makefile
index 4bea54ea870b..f66c24167f18 100644
--- a/devel/mono-addins/Makefile
+++ b/devel/mono-addins/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	mono-addins
 PORTVERSION=	1.3
 DISTVERSIONPREFIX=	${PORTNAME}-
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mono framework to create extensible applications
 WWW=		https://www.mono-project.com/Mono.Addins
 
 LICENSE=	MIT
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mono
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_path_MCS=${LOCALBASE}/bin/mcs
 USES=		autoreconf gmake gnome mono pkgconfig
 
 OPTIONS_DEFINE=	GTK2 GTK3
 OPTIONS_DEFAULT=GTK2
 OPTIONS_SUB=	yes
 
 GTK2_USE=	GNOME=gtksharp20
 GTK2_CONFIGURE_ENABLE=	gui
 
 #GTK3_USE=	GNOME=gtksharp30
 GTK3_CONFIGURE_ENABLE=	gui-gtk3
 
 PLIST_SUB+=	VER=1.0.0
 
 .include <bsd.port.mk>
diff --git a/devel/msbuild/Makefile b/devel/msbuild/Makefile
index c5c1df232b55..202008202cc7 100644
--- a/devel/msbuild/Makefile
+++ b/devel/msbuild/Makefile
@@ -1,48 +1,48 @@
 PORTNAME=	msbuild
 DISTVERSIONPREFIX=	v
 DISTVERSION=	15.8-preview
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/mono/msbuild/releases/download/0.06/:bootstrap
 DISTFILES=	mono_msbuild_xplat-master-3c930fa8.zip:bootstrap
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Build platform for .NET and Visual Studio
 WWW=		https://github.com/Microsoft/msbuild
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	bash:shells/bash
 
 NUGET_FEEDS=	DOTNET_CORE NUGET ROSLYN ROSLYN_TOOLS SYMREADER_CONVERTER
 NUGET_LAYOUT=	dotnet
 
 USES=		mono:nuget shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	mono
 GH_TAGNAME=	0.06
 SHEBANG_FILES=	*.sh artifacts/mono-msbuild/msbuild build.sh build/*.sh
 
 MAKE_ENV=	GIT_COMMIT=3c930fa8721935cf0e381fd349f6f50cf2bc223d
 MAKE_JOBS_UNSAFE=MSBuild has not implemented concurrent builds on non Windows platforms
 ALL_TARGET=	all-mono
 TEST_TARGET=	test-mono
 
 post-extract:
 	${MKDIR} ${WRKSRC}/artifacts
 	${MV} ${WRKDIR}/msbuild ${WRKSRC}/artifacts/mono-msbuild
 
 do-build:
 	(cd ${WRKSRC}; \
 		${SETENV} ${MAKE_ENV} ./build/build.sh -host mono -configuration Release -skipTests build)
 
 do-install:
 	(cd ${WRKSRC}; \
 		${SETENV} ${MAKE_ENV} DESTDIR=${STAGEDIR} PATH=${WRKSRC}/artifacts/mono-msbuild:$$PATH ./install-mono-prefix.sh ${PREFIX})
 
 do-test:
 	(cd ${WRKSRC}; \
 		${SETENV} ${MAKE_ENV} ./build/build.sh -host mono -configuration Release build)
 
 .include <bsd.port.mk>
diff --git a/devel/nant/Makefile b/devel/nant/Makefile
index 44b1cfeda10d..84b07aa3c3ce 100644
--- a/devel/nant/Makefile
+++ b/devel/nant/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	nant
 PORTVERSION=	0.92
 DISTVERSIONSUFFIX=	-src
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	SF
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	.NET build tool inspired by Ant
 WWW=		https://github.com/nant/nant
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 INSTALL_TARGET=	install destdir=${STAGEDIR} prefix=${PREFIX}
 MAKE_ARGS=	MCS=mcs MONO='mono --runtime=v4.0' TARGET=mono-4.0
 MAKE_JOBS_UNSAFE=	yes
 TEST_TARGET=	run-test
 USES=		gmake mono pkgconfig
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 DATADIR=	${PREFIX}/share/NAnt
 DOCSDIR=	${PREFIX}/share/doc/NAnt
 EXAMPLESDIR=	${PREFIX}/share/examples/NAnt
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|lib/pkgconfig|libdata/pkgconfig|' ${WRKSRC}/NAnt.build
 	@${REINPLACE_CMD} -e 's|lib/mono/4.0|lib/mono/4.0-api|' \
 		${WRKSRC}/src/NAnt.Console/App.config \
 		${WRKSRC}/tests/NAnt.Core/Framework.config
 
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
 	cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/
 
 .include <bsd.port.mk>
diff --git a/devel/ndesk-dbus-glib/Makefile b/devel/ndesk-dbus-glib/Makefile
index 00e4549f4352..c02f47802a56 100644
--- a/devel/ndesk-dbus-glib/Makefile
+++ b/devel/ndesk-dbus-glib/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	ndesk-dbus-glib
 PORTVERSION=	0.4.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	http://www.ndesk.org/archive/ndesk-dbus/
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GLib main loop integration for Managed D-Bus
 WWW=		http://www.ndesk.org/DBusSharp
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-1.0.pc:devel/ndesk-dbus
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-1.0.pc:devel/ndesk-dbus
 
 USES=		gmake mono pathfix pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_path_GMCS=${LOCALBASE}/bin/mcs
 
 OPTIONS_DEFINE=	DOCS
 
 DOCS=		AUTHORS COPYING README
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${DOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/devel/ndesk-dbus/Makefile b/devel/ndesk-dbus/Makefile
index d751073e8f5c..1b8e551b891e 100644
--- a/devel/ndesk-dbus/Makefile
+++ b/devel/ndesk-dbus/Makefile
@@ -1,25 +1,25 @@
 PORTNAME=	ndesk-dbus
 PORTVERSION=	0.6.1a
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://www.ndesk.org/archive/ndesk-dbus/
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	C\# implementation of D-Bus
 WWW=		http://www.ndesk.org/DBusSharp
 
 USES=		gmake mono pathfix pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_path_CSC=${LOCALBASE}/bin/mcs
 
 OPTIONS_DEFINE=	DOCS
 
 DOCS=		AUTHORS COPYING README
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${DOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/devel/ndesk-options/Makefile b/devel/ndesk-options/Makefile
index cdb44e4418bd..3a51ae221852 100644
--- a/devel/ndesk-options/Makefile
+++ b/devel/ndesk-options/Makefile
@@ -1,19 +1,19 @@
 PORTNAME=	ndesk-options
 PORTVERSION=	0.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://www.ndesk.org/archive/${PORTNAME}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Callback-based program option parser for C\#
 WWW=		http://www.ndesk.org/Options
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_path_MCS=${LOCALBASE}/bin/mcs
 USES=		gmake mono pathfix pkgconfig
 PATHFIX_MAKEFILEIN=	Makefile.in configure
 
 post-extract:
 	@${MV} ${WRKSRC}/lib ${WRKSRC}/libdata
 
 .include <bsd.port.mk>
diff --git a/devel/newtonsoft-json/Makefile b/devel/newtonsoft-json/Makefile
index aae9627a1bef..42c183394183 100644
--- a/devel/newtonsoft-json/Makefile
+++ b/devel/newtonsoft-json/Makefile
@@ -1,48 +1,48 @@
 PORTNAME=	newtonsoft-json
 PORTVERSION=	9.0.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Popular high-performance JSON framework for .NET
 WWW=		http://james.newtonking.com/json
 
 LICENSE=	MIT
 
 USES=		mono
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	JamesNK
 GH_PROJECT=	Newtonsoft.Json
 
 SUB_FILES=	Newtonsoft.Json.pc
 
 NO_ARCH=	yes
 
 PLIST_FILES=	lib/mono/Newtonsoft.Json/Newtonsoft.Json.dll \
 		lib/mono/gac/Newtonsoft.Json/7.0.0.0__b9a188c8922137c6/Newtonsoft.Json.dll \
 		lib/mono/gac/Newtonsoft.Json/7.0.0.0__b9a188c8922137c6/Newtonsoft.Json.pdb \
 		libdata/pkgconfig/Newtonsoft.Json.pc
 
 .include <bsd.port.pre.mk>
 
 .if defined(MONO_DEFAULT) && ${MONO_DEFAULT} > 6
 BROKEN=		fails to build with Mono version ${MONO_DEFAULT}: Failure adding assembly dbus-sharp.dll to the cache: Strong name cannot be verified for delay-signed assembly
 .endif
 
 do-build:
 	(cd ${WRKSRC}/Src/Newtonsoft.Json && ${SETENV} ${MAKE_ENV} xbuild Newtonsoft.Json.csproj \
 		/property:SignAssembly=true \
 		/property:AssemblyOriginatorKeyFile=Dynamic.snk \
 		/property:Configuration=Release \
 		/property:DefineConstants='SIGNED NET45 TRACE')
 
 do-install:
 	(cd ${WRKSRC}/Src/Newtonsoft.Json/bin/Release/Net45 && \
 		${SETENV} MONO_SHARED_DIR=${WRKDIR} ${LOCALBASE}/bin/gacutil \
 		/root ${STAGEDIR}${PREFIX}/lib/ \
 		/package Newtonsoft.Json /i Newtonsoft.Json.dll)
 	(cd ${WRKDIR} && ${INSTALL_DATA} Newtonsoft.Json.pc \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig)
 
 .include <bsd.port.post.mk>
diff --git a/devel/nini/Makefile b/devel/nini/Makefile
index 1a6ed3967347..f60cd35dfe49 100644
--- a/devel/nini/Makefile
+++ b/devel/nini/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	nini
 PORTVERSION=	1.1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	SF/nini/Nini/${PORTVERSION}
 DISTNAME=	Nini-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	NET configuration library
 WWW=		http://nini.sourceforge.net
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 USES=		mono zip
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 WRKSRC=		${WRKDIR}/Nini
 NINI_VERSION=	${PORTVERSION:C/([0-9]*\.[0-9]*).*/\1/}
 SUB_FILES=	${PORTNAME}.pc
 SUB_LIST=	PORTVERSION=${PORTVERSION} \
 		NINI_VERSION=${NINI_VERSION}
 PLIST_SUB=	NINI_VERSION=${NINI_VERSION}
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 do-install:
 	@(cd ${INSTALL_WRKSRC}/Bin/Mono/1.1/Release && ${SETENV} MONO_SHARED_DIR=${WRKDIR} ${LOCALBASE}/bin/gacutil -root ${STAGEDIR}${PREFIX}/lib/ -gacdir ${STAGEDIR}${PREFIX}/lib -package ${PORTNAME}-${NINI_VERSION} -i Nini.dll)
 	${INSTALL_DATA} ${WRKDIR}/nini.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/nini-${NINI_VERSION}.pc
 
 do-install-DOCS-on:
 	@(cd ${WRKSRC}/Docs/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 do-install-EXAMPLES-on:
 	@(cd ${WRKSRC}/Examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
diff --git a/devel/notify-sharp/Makefile b/devel/notify-sharp/Makefile
index 7df887d603cf..6f05568c840b 100644
--- a/devel/notify-sharp/Makefile
+++ b/devel/notify-sharp/Makefile
@@ -1,25 +1,25 @@
 PORTNAME=	notify-sharp
 PORTVERSION=	3.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	https://www.meebey.net/projects/notify-sharp/downloads/
 
 MAINTAINER=	fox@FreeBSD.org
 COMMENT=	C\# client library for notification-daemon
 WWW=		http://www.ndesk.org/NotifySharp
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-sharp-2.0.pc:devel/dbus-sharp \
 		${LOCALBASE}/libdata/pkgconfig/dbus-sharp-glib-2.0.pc:devel/dbus-sharp-glib \
 		${LOCALBASE}/libdata/pkgconfig/gtk-sharp-3.0.pc:x11-toolkits/gtk-sharp30
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-sharp-2.0.pc:devel/dbus-sharp \
 		${LOCALBASE}/libdata/pkgconfig/dbus-sharp-glib-2.0.pc:devel/dbus-sharp-glib \
 		${LOCALBASE}/libexec/notification-daemon:deskutils/notification-daemon
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_path_GMCS=${LOCALBASE}/bin/mcs
 USES=		gmake gnome mono pathfix pkgconfig
 
 .include <bsd.port.mk>
diff --git a/editors/bless/Makefile b/editors/bless/Makefile
index 1269dcf77f70..1787a8d330fb 100644
--- a/editors/bless/Makefile
+++ b/editors/bless/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	bless
 PORTVERSION=	0.6.3
 PORTEPOCH=	1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	editors
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	High-quality, full-featured hexadecimal editor
 WWW=		https://github.com/afrantzis/bless
 
 LICENSE=	GPLv2+
 
 USES=		gnome meson mono pkgconfig
 USE_GNOME=	gtksharp20
 USE_GITHUB=	yes
 GH_ACCOUNT=	afrantzis
 
 MESON_ARGS=	-Dtests=false
 
 OPTIONS_DEFINE=	HELP
 OPTIONS_DEFAULT=	HELP
 OPTIONS_SUB=	yes
 
 HELP_DESC=	Install DocBook and HTML user documentation
 HELP_BUILD_DEPENDS=	${LOCALBASE}/share/xsl/docbook/html/chunk.xsl:textproc/docbook-xsl \
 		itstool:textproc/itstool xsltproc:textproc/libxslt
 HELP_USES=	gettext-tools
 HELP_MESON_OFF=	-Duser_doc=false -Dhtml_user_doc=false
 
 post-patch:
 	@${REINPLACE_CMD} -E 's,https?://.*/release/xsl/current,${LOCALBASE}/share/xsl/docbook,' \
 		${WRKSRC}/doc/user/meson.build
 
 .include <bsd.port.mk>
 
 # XXX: stripping Mono/.Net PE32 executables (DLLs) does not work
 CONFIGURE_ARGS:=	${CONFIGURE_ARGS:N--strip}
diff --git a/emulators/mesen/Makefile b/emulators/mesen/Makefile
index 92bda6a78103..2121ab14d94c 100644
--- a/emulators/mesen/Makefile
+++ b/emulators/mesen/Makefile
@@ -1,82 +1,82 @@
 PORTNAME=	mesen
 DISTVERSION=	0.9.8-4
 DISTVERSIONSUFFIX=	-g4c701ad6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	emulators
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Cross-platform Nintendo Entertainment System (NES/Famicom) emulator
 WWW=		https://www.mesen.ca/
 
 LICENSE=	GPLv3
 
 # ARM/MIPS are only supported on Android
 ONLY_FOR_ARCHS=	amd64 i386
 
 BUILD_DEPENDS=	zip:archivers/zip \
 		evdev-proto>0:devel/evdev-proto \
 		msbuild:devel/msbuild
 LIB_DEPENDS=	libevdev.so:devel/libevdev \
 		libgdiplus.so:x11-toolkits/libgdiplus
 
 USES=		compiler:c++14-lang gmake pkgconfig sdl
 USE_GITHUB=	yes
 GH_ACCOUNT=	SourMesen
 GH_PROJECT=	Mesen
 USE_SDL=	sdl2
 MAKEFILE=	makefile
 MAKE_ARGS=	MESENPLATFORM=${MESEN_ARCH} \
 		CC="${CC}" CPPC="${CXX}" \
 		FSLIB=-lc++experimental \
 		LTO=true \
 		SYSTEM_LIBEVDEV=true
 MESEN_ARCH=	${ARCH:S/amd64/x64/:S/i386/x86/}
 
 OPTIONS_MULTI=			FRONTENDS
 OPTIONS_MULTI_FRONTENDS=	MONO LIBRETRO
 OPTIONS_DEFAULT=		MONO LIBRETRO
 OPTIONS_SUB=			yes
 
 MONO_DESC=	Mono based GUI frontend
 LIBRETRO_DESC=	Libretro core
 
 MONO_ALL_TARGET=	ui
 MONO_BUILD_DEPENDS=	mono:lang/mono${MONO_DEFAULT}
 MONO_RUN_DEPENDS=	mono:lang/mono${MONO_DEFAULT}
 MONO_DESKTOP_ENTRIES=	"Mesen" "NES/Famicom Emulator" \
 			"${PORTNAME}" "${PORTNAME}" "Game;Emulator;" false
 
 LIBRETRO_ALL_TARGET=	libretro
 
 .include <bsd.port.pre.mk>
 
 .if defined(MONO_DEFAULT) && ${MONO_DEFAULT} > 6
 BROKEN=		fails to build with Mono version ${MONO_DEFAULT}: error MSB4184: The expression ""Program.cs".GetPathsOfAllDirectoriesAbove()" cannot be evaluated. Method 'System.String.GetPathsOfAllDirectoriesAbove' not found.
 .endif
 
 do-install: 	# empty to avoid default
 
 do-install-MONO-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/mesen
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/64x64/apps/
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/apps/
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/16x16/apps/
 	${INSTALL_LIB} ${WRKSRC}/bin/${MESEN_ARCH}/Release/Dependencies/libMesenCore.${MESEN_ARCH}.dll \
 			${STAGEDIR}${PREFIX}/libexec/mesen/libMesenCore.dll
 	${INSTALL_DATA} ${WRKSRC}/bin/${MESEN_ARCH}/Release/Mesen.exe \
 			${STAGEDIR}${PREFIX}/libexec/mesen/
 	${INSTALL_DATA} ${WRKSRC}/GUI.NET/Resources/MesenIcon.png \
 			${STAGEDIR}${PREFIX}/share/icons/hicolor/64x64/apps/mesen.png
 	${INSTALL_DATA} ${WRKSRC}/GUI.NET/Resources/MesenIconMedium.png \
 			${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/apps/mesen.png
 	${INSTALL_DATA} ${WRKSRC}/GUI.NET/Resources/MesenIconSmall.png \
 			${STAGEDIR}${PREFIX}/share/icons/hicolor/16x16/apps/mesen.png
 	${INSTALL_SCRIPT} ${FILESDIR}/launch.sh ${STAGEDIR}${PREFIX}/bin/mesen
 	${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${STAGEDIR}${PREFIX}/bin/mesen
 
 do-install-LIBRETRO-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/libretro
 	${INSTALL_LIB} ${WRKSRC}/bin/mesen_libretro.${MESEN_ARCH}.so \
 			${STAGEDIR}${PREFIX}/lib/libretro/mesen_libretro.so
 
 .include <bsd.port.post.mk>
diff --git a/games/gbrainy/Makefile b/games/gbrainy/Makefile
index 61f6ff1ab382..98762410c801 100644
--- a/games/gbrainy/Makefile
+++ b/games/gbrainy/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	gbrainy
 DISTVERSION=	2.4.6
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	games
 MASTER_SITES=	https://gent.softcatala.org/jmas/gbrainy/
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Brain teaser game and trainer
 WWW=		https://live.gnome.org/gbrainy
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	gtk-sharp30>0:x11-toolkits/gtk-sharp30 \
 		itstool:textproc/itstool
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		gettext gmake gnome mono pathfix pkgconfig shebangfix
 USE_GNOME=	intltool
 
 SHEBANG_FILES=	src/Clients/Classical/gbrainy.in
 
 GNU_CONFIGURE=	yes
 MAKE_ENV+=	MONO_REGISTRY_PATH=${WRKDIR}
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
 NLS_EXTRA_PATCHES=	${PATCHDIR}/NLS_ON-patch-Makefile.in
 NLS_EXTRA_PATCHES_OFF=	${PATCHDIR}/NLS_OFF-patch-Makefile.in
 
 .include <bsd.port.mk>
diff --git a/games/openbve/Makefile b/games/openbve/Makefile
index d99018e3d64f..269d775fd11e 100644
--- a/games/openbve/Makefile
+++ b/games/openbve/Makefile
@@ -1,86 +1,86 @@
 PORTNAME=	${GH_PROJECT:tl}
 PORTVERSION=	1.9.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Realistic 3D train/railway simulator
 WWW=		https://openbve-project.net/
 
 LICENSE=	PD
 
 BUILD_DEPENDS=	msbuild:devel/msbuild
 LIB_DEPENDS=	libgdiplus.so:x11-toolkits/libgdiplus
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	leezer3
 GH_PROJECT=	OpenBVE
 
 USES=		gmake mono:nuget openal:soft sdl
 USE_SDL=	sdl2
 MAKEFILE=	makefile
 ALL_TARGET=	all-release
 
 NUGET_DEPENDS=	CS-Script.lib=3.30.3 \
 		DotNetZip=1.16.0 \
 		LibUsbDotNet=2.2.29 \
 		Mono.Cecil=0.11.3 \
 		NAudio.Vorbis=1.2.0 \
 		NAudio=1.10.0 \
 		NLayer.NAudioSupport=1.0.0 \
 		NLayer=1.12.0 \
 		NVorbis=0.10.1 \
 		OpenTK-OpenBVE=1.0.2 \
 		OpenTK.GLControl-OpenBVE=1.0.1 \
 		Prism.Core=7.2.0.1422 \
 		ReactiveProperty.Core=7.1.0 \
 		ReactiveProperty=7.1.0 \
 		SharpCompress=0.32.2 \
 		System.Buffers=4.5.1 \
 		System.ComponentModel.Annotations=4.7.0 \
 		System.Memory=4.5.5 \
 		System.Numerics.Vectors=4.5.0 \
 		System.Reactive=4.4.1 \
 		System.Runtime.CompilerServices.Unsafe=6.0.0 \
 		System.Text.Encoding.CodePages=6.0.0 \
 		System.Threading.Tasks.Extensions=4.5.4 \
 		System.ValueTuple=4.5.0 \
 		Ude.NetStandard=1.2.0
 
 DATADIR=	${PREFIX}/lib/${PORTNAME}
 PORTDOCS=	changelog.md credits.md routes-and-trains.txt
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.pre.mk>
 
 .if defined(MONO_DEFAULT) && ${MONO_DEFAULT} > 6
 BROKEN=		fails to build with Mono version ${MONO_DEFAULT}: error MSB4184: The expression ""Program.cs".GetPathsOfAllDirectoriesAbove()" cannot be evaluated. Method 'System.String.GetPathsOfAllDirectoriesAbove' not found.
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e '/TargetFrameworkVersion/s,4\.7\.2,4.6.1,' \
 		${WRKSRC}/source/TrainEditor2/TrainEditor2.csproj
 
 do-install:
 # This is Windows only, so can be removed
 	${RM} ${WRKSRC}/bin_release/AtsPluginProxy.*
 	${CP} -a ${WRKSRC}/bin_release ${STAGEDIR}${DATADIR}
 .for script program in openbve OpenBve openbve-objectviewer ObjectViewer \
     openbve-routeviewer RouteViewer
 	${PRINTF} '#!/bin/sh\n\nexec mono ${DATADIR}/${program}.exe\
 		"$$@"\n' > ${STAGEDIR}${PREFIX}/bin/${script}
 	${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/${script}
 .endfor
 	${INSTALL_MAN} ${WRKSRC}/debian/*.6 ${STAGEDIR}${MANPREFIX}/man/man6
 	${INSTALL_DATA} ${WRKSRC}/debian/openbve.desktop \
 		${STAGEDIR}${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/debian/openbve.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/debian/,} \
 		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
diff --git a/games/openclaw/Makefile b/games/openclaw/Makefile
index 1c1311caef9d..b1f9159a75ed 100644
--- a/games/openclaw/Makefile
+++ b/games/openclaw/Makefile
@@ -1,77 +1,77 @@
 PORTNAME=	OpenClaw
 DISTVERSION=	0.3-98
 DISTVERSIONSUFFIX=	-g3586dfa
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 
 PATCH_SITES=	https://github.com/valpackett/${GH_PROJECT}/commit/
 PATCHFILES+=	005aa1d36cae.patch:-p1 # fix running without launcher
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Reimplementation of Captain Claw (1997) platformer
 WWW=		https://github.com/pjasicek/OpenClaw
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS=	libtinyxml.so:textproc/tinyxml
 
 USES=		cmake compiler:c++11-lib localbase:ldflags pkgconfig sdl
 USE_GITHUB=	yes
 GH_ACCOUNT=	pjasicek
 USE_SDL=	gfx2 image2 mixer2 ttf2
 
 CMAKE_ARGS+=	-DDEFAULT_ASSETS_FOLDER=${DATADIR}/
 
 PLIST_FILES=	bin/openclaw
 PORTDATA=	ASSETS.ZIP SAVES.XML clacon.ttf config.xml console02.tga
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	LAUNCHER
 OPTIONS_DEFAULT=	LAUNCHER
 
 LAUNCHER_DESC=	Install launcher to manage game settings
 LAUNCHER_USES=	magick:6,build mono
 LAUNCHER_PLIST_FILES=	bin/ClawLauncher.exe bin/clawlauncher
 LAUNCHER_DESKTOP_ENTRIES=	\
 		"${GH_PROJECT}" \
 		"" \
 		"${PORTNAME:tl}" \
 		"clawlauncher" \
 		"Game;ArcadeGame;" \
 		""
 
 post-patch:
 	@${REINPLACE_CMD} '/CMAKE_RUNTIME_OUTPUT_DIRECTORY/d; s| -O2 -g||' \
 		${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} -e 's|/usr/share/openclaw|${DATADIR}|g' \
 		${WRKSRC}/Build_Release/clawlauncher \
 		${WRKSRC}/Build_Release/config_linux_release.xml
 
 pre-build:
 	@cd ${WRKSRC}/Build_Release && ${CP} config_linux_release.xml config.xml
 
 post-build-LAUNCHER-on:
 	@convert -verbose -set filename:size %wx%h \
 		${WRKSRC}/ClawLauncher/Resources/launcher_icon.ico \
 		${WRKDIR}/launcher_icon_%\[filename:size].png
 
 do-install:
 	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${PORTNAME:tl} \
 		${STAGEDIR}${PREFIX}/bin
 	@cd ${WRKSRC}/Build_Release && ${COPYTREE_SHARE} \
 		"${PORTDATA}" ${STAGEDIR}${DATADIR}
 
 do-install-LAUNCHER-on:
 	${INSTALL_SCRIPT} ${WRKSRC}/Build_Release/ClawLauncher.exe \
 		${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/Build_Release/clawlauncher \
 		${STAGEDIR}${PREFIX}/bin
 .for size in 16x16 24x24 32x32 48x48 64x64 96x96 128x128 192x192 256x256
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${size}/apps
 	${INSTALL_DATA} ${WRKDIR}/launcher_icon_${size}.png \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/${size}/apps/${PORTNAME:tl}.png
 	@${ECHO_CMD} share/icons/hicolor/${size}/apps/${PORTNAME:tl}.png >> ${TMPPLIST}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/games/openra/Makefile b/games/openra/Makefile
index 9ba92d28a142..48308ab3ba16 100644
--- a/games/openra/Makefile
+++ b/games/openra/Makefile
@@ -1,86 +1,86 @@
 PORTNAME=	openra
 DISTVERSIONPREFIX=	release-
 DISTVERSION=	20200503
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	games
 MASTER_SITES=	https://download.ip2location.com/lite/:ip2location
 DISTFILES=	IP2LOCATION-LITE-DB1.IPV6.BIN.ZIP:ip2location
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	e13fd693c386.patch:-p1 # https://github.com/OpenRA/OpenRA/pull/17744
 PATCHFILES+=	85096c4ba2fb.patch:-p1 # https://github.com/OpenRA/OpenRA/pull/17744
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Multiplayer re-envisioning of early RTS games by Westwood Studios
 WWW=		https://www.openra.net/
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	msbuild:devel/msbuild
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libgdiplus.so:x11-toolkits/libgdiplus
 NUGET_DEPENDS=	Microsoft.NETFramework.ReferenceAssemblies=1.0.0 \
 		Microsoft.NETFramework.ReferenceAssemblies.net472=1.0.0 \
 		NUnit=3.12.0 \
 		NUnit.Console=3.11.1 \
 		NUnit.ConsoleRunner=3.11.1 \
 		NUnit.Extension.NUnitProjectLoader=3.6.0 \
 		NUnit.Extension.NUnitV2Driver=3.8.0 \
 		NUnit.Extension.NUnitV2ResultWriter=3.6.0 \
 		NUnit.Extension.TeamCityEventListener=1.0.7 \
 		NUnit.Extension.VSProjectLoader=3.8.0 \
 		NUnit3TestAdapter=3.16.1 \
 		NuGet.CommandLine=4.4.1 \
 		OpenRA-Eluant=1.0.17 \
 		OpenRA-Freetype6=1.0.4 \
 		OpenRA-FuzzyLogicLibrary=1.0.1 \
 		OpenRA-Open.NAT=1.0.0 \
 		OpenRA-OpenAL-CS=1.0.16 \
 		OpenRA-SDL2-CS=1.0.26 \
 		SharpZipLib=1.2.0 \
 		StyleCop.Analyzers=1.1.118 \
 		rix0rrr.BeaconLib=1.0.2
 
 USE_GITHUB=	yes
 GH_PROJECT=	OpenRA
 
 NO_ARCH=	yes
 USES=		desktop-file-utils gmake lua:51 mono:nuget openal:soft sdl \
 		shared-mime-info
 USE_SDL=	sdl2
 MAKE_ENV=	prefix="${PREFIX}" \
 		gameinstalldir="${DATADIR}"
 ALL_TARGET=	all
 INSTALL_TARGET=	install install-man-page \
 		install-linux-appdata install-linux-mime install-linux-shortcuts
 PORTDATA=	*
 
 .include <bsd.port.pre.mk>
 
 .if defined(MONO_DEFAULT) && ${MONO_DEFAULT} > 6
 BROKEN=		fails to build with Mono version ${MONO_DEFAULT}: error MSB4184: The expression ""Program.cs".GetPathsOfAllDirectoriesAbove()" cannot be evaluated. Method 'System.String.GetPathsOfAllDirectoriesAbove' not found.
 .endif
 
 post-extract:
 	${CP} ${_DISTDIR}/${DISTFILES:C/:.*//:MIP2LOCATION-*} ${WRKSRC}
 
 post-patch:
 	${REINPLACE_CMD} \
 		-e 's/ -verbosity:m//' \
 		-e '/echo/!s/	@/	/' \
 		-e '/^VERSION/s/=.*/=	${GH_TAGNAME}/' \
 		-e '/^core:/s/$$/ version/' \
 		${WRKSRC}/Makefile
 .if defined(PATCHFILES)
 	${CHMOD} +x ${WRKSRC}/configure-system-libraries.sh
 .endif
 	${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},' \
 		-e '/target/s,$${DIR}/,,' \
 		${WRKSRC}/configure-system-libraries.sh
 
 do-test:
 	@(cd ${TEST_WRKSRC} && mono \
 		${NUGET_PACKAGEDIR}/NUnit.ConsoleRunner/tools/nunit3-console.exe \
 		--noresult OpenRA.Test.dll)
 
 .include <bsd.port.post.mk>
diff --git a/graphics/nplot/Makefile b/graphics/nplot/Makefile
index 4b9611166d76..786c2abd9cd8 100644
--- a/graphics/nplot/Makefile
+++ b/graphics/nplot/Makefile
@@ -1,47 +1,47 @@
 PORTNAME=	nplot
 PORTVERSION=	0.9.11
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 
 MAINTAINER=	cs@innolan.dk
 COMMENT=	Charting library for .NET
 WWW=		http://nplot.com
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libgdiplus.so:x11-toolkits/libgdiplus \
 		libcairo.so:graphics/cairo
 RUN_DEPENDS=	webfonts>=0:x11-fonts/webfonts
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mhowlett
 GH_TAGNAME=	9a92e78
 
 SUB_FILES=	NPlot.pc
 USES=		mono ssl
 
 PLIST_FILES=	lib/mono/NPlot/NPlot.dll \
 		lib/mono/gac/NPlot/0.9.11.0__1d82a50c5d01c44e/NPlot.dll \
 		libdata/pkgconfig/NPlot.pc
 
 .include <bsd.port.pre.mk>
 
 .if defined(MONO_DEFAULT) && ${MONO_DEFAULT} > 6
 BROKEN=		fails to build with Mono version ${MONO_DEFAULT}: Failure adding assembly dbus-sharp.dll to the cache: Strong name cannot be verified for delay-signed assembly
 .endif
 
 pre-build:
 	openssl enc -base64 -d <${PATCHDIR}/Dynamic.key >${WRKSRC}/src/Dynamic.snk
 
 do-build:
 	(cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} xbuild NPlot.csproj \
 		/p:Configuration=Release /p:SignAssembly=true \
 		/p:AssemblyOriginatorKeyFile=Dynamic.snk)
 
 do-install:
 	(cd ${WRKSRC}/src && ${SETENV} MONO_SHARED_DIR=${WRKDIR} ${LOCALBASE}/bin/gacutil \
 		-root ${STAGEDIR}${PREFIX}/lib/ -package NPlot -i bin/NPlot.dll)
 	(cd ${WRKDIR} && ${INSTALL_DATA} NPlot.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig)
 
 .include <bsd.port.post.mk>
diff --git a/graphics/pinta/Makefile b/graphics/pinta/Makefile
index 10a8b7d497ac..0284b5731147 100644
--- a/graphics/pinta/Makefile
+++ b/graphics/pinta/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	pinta
 PORTVERSION=	1.7.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	https://github.com/PintaProject/Pinta/releases/download/${PORTVERSION}/
 
 MAINTAINER=	olivierw1+bugzilla-freebsd@hotmail.com
 COMMENT=	Simple Gtk\# Paint Program
 WWW=		https://pinta-project.com/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/license-mit.txt
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/mono-addins.pc:devel/mono-addins \
 		intltool-update:textproc/intltool
 RUN_DEPENDS=	mono-addins>0:devel/mono-addins
 
 USES=		desktop-file-utils gmake gnome mono pkgconfig gettext-tools:build
 USE_GNOME=	gtksharp20
 GNU_CONFIGURE=	yes
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
 NLS_CONFIGURE_ENABLE=	nls
 
 .include <bsd.port.mk>
diff --git a/irc/smartirc4net/Makefile b/irc/smartirc4net/Makefile
index 5a601915c5a9..7c2ba7ef7bf9 100644
--- a/irc/smartirc4net/Makefile
+++ b/irc/smartirc4net/Makefile
@@ -1,18 +1,18 @@
 PORTNAME=	smartirc4net
 PORTVERSION=	1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	irc
 MASTER_SITES=	https://smuxi.im/jaws/data/files/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Multi-layered IRC library
 WWW=		http://smartirc4net.meebey.net/jaws/
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_path_MCS=${LOCALBASE}/bin/mcs
 USES=		gmake mono pathfix pkgconfig
 
 .include <bsd.port.mk>
diff --git a/irc/smuxi/Makefile b/irc/smuxi/Makefile
index 166de3431106..b066390b333f 100644
--- a/irc/smuxi/Makefile
+++ b/irc/smuxi/Makefile
@@ -1,46 +1,46 @@
 PORTNAME=	smuxi
 PORTVERSION=	1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	irc
 MASTER_SITES=	http://www.smuxi.org/jaws/data/files/
 
 MAINTAINER=	fox@FreeBSD.org
 COMMENT=	Smart MUltipleXed Irc
 WWW=		https://smuxi.im/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/log4net.pc:devel/log4net \
 		${LOCALBASE}/libdata/pkgconfig/mono-addins.pc:devel/mono-addins \
 		${LOCALBASE}/libdata/pkgconfig/nini-1.1.pc:devel/nini \
 		bash:shells/bash \
 		intltool-update:textproc/intltool
 LIB_DEPENDS=	libstfl.so:devel/stfl
 RUN_DEPENDS=	mono-addins>0:devel/mono-addins
 
 GNU_CONFIGURE=	yes
 USES=		desktop-file-utils gettext-tools:build gmake gnome mono \
 		pkgconfig
 USE_GNOME=	gtksharp20
 
 OPTIONS_DEFINE=		DBUS NLS SPELLCHECK
 OPTIONS_DEFAULT=	DBUS NLS SPELLCHECK
 OPTIONS_SUB=		yes
 
 SPELLCHECK_DESC=	Spell checking support via GtkSpell
 
 DBUS_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-sharp-glib-2.0.pc:devel/dbus-sharp-glib \
 			${LOCALBASE}/libdata/pkgconfig/gtk-sharp-3.0.pc:x11-toolkits/gtk-sharp30
 
 SPELLCHECK_LIB_DEPENDS=	libgtkspell.so:textproc/gtkspell
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
 CONFIGURE_SHELL=	"env ${LOCALBASE}/bin/bash"
 
 # Fails due to build order dependency issue.
 MAKE_JOBS_UNSAFE=	yes
 
 .include <bsd.port.mk>
diff --git a/lang/fsharp/Makefile b/lang/fsharp/Makefile
index f3c1282ce179..8152a72d76b4 100644
--- a/lang/fsharp/Makefile
+++ b/lang/fsharp/Makefile
@@ -1,40 +1,40 @@
 PORTNAME=	fsharp
 PORTVERSION=	10.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Functional and object-oriented language for the .NET platform
 WWW=		https://fsharp.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	msbuild:devel/msbuild
 TEST_DEPENDS=	libgdiplus>=0:x11-toolkits/libgdiplus
 
 USES=		gmake mono:nuget pkgconfig
 USE_GITHUB=	yes
 MAKE_JOBS_UNSAFE=	Build not parallelizable
 NUGET_LAYOUT=	legacy
 NO_ARCH=	yes
 
 do-test:
 	${MKDIR} ${WRKDIR}/bin
 	echo "#!/bin/sh" > ${WRKDIR}/bin/fsharpc
 	echo 'exec ${LOCALBASE}/bin/mono ${WRKSRC}/Release/net40/bin/fsc.exe "$$@"' >> ${WRKDIR}/bin/fsharpc
 	${CHMOD} 0755 ${WRKDIR}/bin/fsharpc
 	(cd ${WRKSRC}/tests/fsharp/core; \
 		${ENV} \
 			PATH=${WRKDIR}/bin:${PATH} \
 			MONO_PATH=${WRKSRC}/Release/net40/bin \
 			./run-all.sh)
 
 .include <bsd.port.pre.mk>
 
 .if defined(MONO_DEFAULT) && ${MONO_DEFAULT} > 6
 BROKEN=		fails to build with Mono version ${MONO_DEFAULT}: A unique overload for method 'GetFileNameWithoutExtension' could not be determined based on type information prior to this program point
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/lang/mono-basic/Makefile b/lang/mono-basic/Makefile
index a012d48b7419..31695301b6cb 100644
--- a/lang/mono-basic/Makefile
+++ b/lang/mono-basic/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	mono-basic
 PORTVERSION=	4.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	http://download.mono-project.com/sources/${PORTNAME}/ \
 		http://ftp.novell.com/pub/mono/sources/${PORTNAME}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	VisualBasic.NET support for Mono
 WWW=		http://www.mono-project.com/VisualBasic.NET
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX}
 USES=		gmake mono tar:bzip2
 
 do-test:
 	@(cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} MONO_PATH=${WRKSRC}/class/lib/net_4_5 ${MAKE_CMD} \
 			${MAKE_FLAGS} Makefile ${MAKE_ARGS} test)
 
 .include <bsd.port.mk>
diff --git a/misc/gedkeeper/Makefile b/misc/gedkeeper/Makefile
index 241694937b54..b27bb89ebca5 100644
--- a/misc/gedkeeper/Makefile
+++ b/misc/gedkeeper/Makefile
@@ -1,66 +1,66 @@
 PORTNAME=	gedkeeper
 PORTVERSION=	2.25.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Personal genealogical database editor
 WWW=		http://gedkeeper.net/
 
 LICENSE=	GPLv3+
 
 BUILD_DEPENDS=	msbuild:devel/msbuild
 LIB_DEPENDS=	libgdiplus.so:x11-toolkits/libgdiplus
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 USES=		desktop-file-utils mono shared-mime-info
 USE_GITHUB=	yes
 GH_ACCOUNT=	Serg-Norseman
 GH_PROJECT=	GEDKeeper GKCommunicator:gkc GKGenetix:gkg
 GH_TAGNAME=	ea5c467:gkc 5d51cfd:gkg
 GH_SUBDIR=	projects/GKCommunicator:gkc projects/GKGenetix:gkg
 
 .if defined(WITH_DEBUG)
 _BUILD_TYPE=	Debug
 .else
 _BUILD_TYPE=	Release
 .endif
 
 DATADIR=	${PREFIX}/lib/${PORTNAME}
 
 post-patch:
 	@${REINPLACE_CMD} -E '/^(Path|Icon)=/s,/usr,${PREFIX}, ; \
 	    /^Exec=/s,gk_run\.sh,${PORTNAME},' \
 		${WRKSRC}/deploy/gedkeeper.desktop
 
 do-build:
 	cd ${BUILD_WRKSRC} && msbuild projects/GKv2/GEDKeeper2.sln \
 		/p:Configuration=${_BUILD_TYPE} /p:MonoCS=true
 
 do-install:
 	${PRINTF} '#!/bin/sh\n\nexec mono ${DATADIR}/GEDKeeper2.exe\
 		"$$@"\n' > ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	cd ${INSTALL_WRKSRC} && ${CP} -a backgrounds bin/ externals \
 		locales plugins samples scripts themes ${STAGEDIR}${DATADIR}
 	@${RM} ${STAGEDIR}${DATADIR}/scripts/readme.txt
 	${INSTALL_DATA} ${INSTALL_WRKSRC}/deploy/gedkeeper.desktop \
 		${STAGEDIR}${PREFIX}/share/applications
 	${INSTALL_DATA} ${INSTALL_WRKSRC}/deploy/gedkeeper.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/mime/packages
 	${INSTALL_DATA} ${INSTALL_WRKSRC}/deploy/application-x-gedkeeper.xml \
 		${STAGEDIR}${PREFIX}/share/mime/packages
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/metainfo
 	${INSTALL_DATA} ${INSTALL_WRKSRC}/deploy/gedkeeper.appdata.xml \
 		${STAGEDIR}${PREFIX}/share/metainfo
 
 do-test:
 	cd ${TEST_WRKSRC} && TEMP=/tmp nunit-console \
 		projects/GKTests/bin/${_BUILD_TYPE}/GKTests.dll
 
 .include <bsd.port.mk>
 
 PATCH_ARGS=	-l
diff --git a/net/avahi-sharp/Makefile b/net/avahi-sharp/Makefile
index 4555b63c2bab..5e56caca9cd7 100644
--- a/net/avahi-sharp/Makefile
+++ b/net/avahi-sharp/Makefile
@@ -1,27 +1,27 @@
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net dns
 PKGNAMESUFFIX=	-sharp
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mono bindings for Avahi service discovery
 
 LIB_DEPENDS=	libavahi-core.so:net/avahi-app
 
 USES=		mono
 MASTERDIR=	${.CURDIR}/../avahi-app
 BUILD_WRKSRC=	${WRKSRC}/avahi-sharp
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
 
 AVAHI_SLAVE=	sharp
 AVAHI_PKGCONFIG=avahi-sharp.pc
 
 post-patch:
 	@${REINPLACE_CMD} 's|@CLIENT_DLNAME@|libavahi-client.so|g; \
 		s|@COMMON_DLNAME@|libavahi-common.so|g; \
 		s|@GLIB_DLNAME@|libavahi-glib.so|g' \
 		${BUILD_WRKSRC}/avahi-sharp.dll.config.in
 	@${CP} ${WRKSRC}/avahi-sharp/avahi-sharp.dll.config.in ${WRKSRC}/avahi-sharp/avahi-sharp.dll.config
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net/ntpa/Makefile b/net/ntpa/Makefile
index 5e0fadb9906b..75a7ebe7e177 100644
--- a/net/ntpa/Makefile
+++ b/net/ntpa/Makefile
@@ -1,69 +1,69 @@
 PORTNAME=	ntpa
 PORTVERSION=	0.8.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net
 MASTER_SITES=	http://dist1.innolan.net/ \
 		http://dist2.innolan.net/
 
 MAINTAINER=	cs@innolan.net
 COMMENT=	NTP data collection and charting
 WWW=		http://ntpa.innolan.net/
 
 LICENSE=	MIT BSD3CLAUSE PostgreSQL GPLv2
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	newtonsoft-json>=0:devel/newtonsoft-json
 RUN_DEPENDS=	newtonsoft-json>=0:devel/newtonsoft-json
 
 USES=		mono pkgconfig autoreconf gmake
 GNU_CONFIGURE=	yes
 NO_ARCH=	yes
 OPTIONS_SUB=	yes
 USE_RC_SUBR=	ntpa
 
 USERS=		ntpa
 GROUPS=		ntpa
 
 SUB_FILES=	ntpad ntpav ntpac ntpag
 
 OPTIONS_DEFINE=	WEBFILES GRAPH
 WEBFILES_DESC=	Install web files
 GRAPH_DESC=	Graph generation (requires Cairo)
 
 GRAPH_BUILD_DEPENDS=	nplot>=0:graphics/nplot
 GRAPH_RUN_DEPENDS=	nplot>=0:graphics/nplot
 
 CONFIGURE_ARGS+=	--libdir=${LOCALBASE}/libexec --bindir=${LOCALBASE}/libexec/ntpa
 
 .include <bsd.port.options.mk>
 
 .if ! ${PORT_OPTIONS:MGRAPH}
 CONFIGURE_ENV+=	NPLOT_CFLAGS=" " NPLOT_LIBS="-r:../packages/NPlot.0.9.10.0/lib/net20/NPlot.dll"
 .endif
 
 post-install-WEBFILES-on:
 	${MKDIR} ${STAGEDIR}${WWWDIR}
 	(cd ${WRKSRC}/html && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR})
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/ntpad ${STAGEDIR}${PREFIX}/sbin/ntpa
 	${INSTALL_SCRIPT} ${WRKDIR}/ntpav ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_SCRIPT} ${WRKDIR}/ntpag ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_SCRIPT} ${WRKDIR}/ntpac ${STAGEDIR}${PREFIX}/sbin
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/graph.conf ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/ntpd.conf ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/openntp.conf ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/small.conf ${STAGEDIR}${EXAMPLESDIR}
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/ntpa/
 	${INSTALL_DATA} ${WRKSRC}/examples/ntpa.conf ${STAGEDIR}${PREFIX}/etc/ntpa/ntpa.conf.sample
 	${INSTALL_MAN} ${WRKSRC}/docs/ntpa.1 ${STAGEDIR}${PREFIX}/man/man1
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/CHANGES ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/DATABASE ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/INSTALL ${STAGEDIR}${DOCSDIR}
 	${MKDIR} ${STAGEDIR}/var/log/ntpa
 	${MKDIR} ${STAGEDIR}/var/run/ntpa
 	${INSTALL_DATA} ${FILESDIR}/newsyslog ${STAGEDIR}${ETCDIR}/ntpa.newsyslog
 
 .include <bsd.port.mk>
diff --git a/security/gnome-keyring-sharp/Makefile b/security/gnome-keyring-sharp/Makefile
index 5b7475af85ea..11f7db1da25c 100644
--- a/security/gnome-keyring-sharp/Makefile
+++ b/security/gnome-keyring-sharp/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	gnome-keyring-sharp
 PORTVERSION=	1.0.2
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	security
 MASTER_SITES=	http://www.go-mono.com/archive/${PORTNAME}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fully managed implementation of gnome-keyring
 WWW=		https://andrew.jorgensenfamily.us/2008/08/gnome-keyring-sharp/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-1.0.pc:devel/ndesk-dbus \
 		${LOCALBASE}/libdata/pkgconfig/gnome-keyring-1.pc:security/libgnome-keyring
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 GNU_CONFIGURE=	yes
 USES=		autoreconf gmake gnome libtool mono pathfix pkgconfig
 USE_GNOME=	gtksharp20
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>
diff --git a/security/keepass-plugin-keepassrpc/Makefile b/security/keepass-plugin-keepassrpc/Makefile
index 78494a89bf07..6ba09441668e 100644
--- a/security/keepass-plugin-keepassrpc/Makefile
+++ b/security/keepass-plugin-keepassrpc/Makefile
@@ -1,40 +1,40 @@
 PORTNAME=	keepassrpc
 PORTVERSION=	1.8.0
 DISTVERSIONPREFIX=v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 PKGNAMEPREFIX=	keepass-plugin-
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	KeePass plugin which facilitates the Kee Firefox plugin
 WWW=		https://www.kee.pm/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	keepass>0:security/keepass
 LIB_DEPENDS=	libgdiplus.so:x11-toolkits/libgdiplus
 
 USES=		cpe mono
 CPE_VENDOR=	kee
 USE_GITHUB=	yes
 GH_ACCOUNT=	kee-org
 
 NO_ARCH=	yes
 DATADIR=	${PREFIX}/share/keepass/Plugins
 
 OPTIONS_DEFINE=	DEBUG
 DEBUG_VARS=	config=Debug
 DEBUG_VARS_OFF=	config=Release
 
 do-build:
 	(cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${LOCALBASE}/bin/xbuild /t:KeePassRPC /p:Configuration=${CONFIG})
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC}/KeePassRPC/bin/${CONFIG} && \
 		${RM} ./KeePass.exe && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
 
 .include <bsd.port.mk>
diff --git a/security/keepass/Makefile b/security/keepass/Makefile
index 1fd73c0997a7..ede5e2313b44 100644
--- a/security/keepass/Makefile
+++ b/security/keepass/Makefile
@@ -1,69 +1,69 @@
 PORTNAME=	keepass
 PORTVERSION=	2.54
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	SF/${PORTNAME}/KeePass%202.x/${PORTVERSION}
 DISTNAME=	KeePass-${PORTVERSION}-Source
 
 MAINTAINER=	m.muenz@gmail.com
 COMMENT=	Light-weight and easy-to-use password manager
 WWW=		https://keepass.info/
 
 LICENSE=	GPLv2+
 
 BUILD_DEPENDS=	icotool:graphics/icoutils
 LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
 		libgdiplus.so:x11-toolkits/libgdiplus
 
 USES=		cpe dos2unix gnome mono zip
 
 DOS2UNIX_GLOB=		*.csproj *.sln
 MAKE_ENV=	MONO_REGISTRY_PATH=${WRKDIR}
 
 DESKTOP_ENTRIES=	"KeePass" \
 			"${COMMENT}" \
 			"${PORTNAME}" \
 			"keepass.sh" \
 			"Utility;" \
 			true
 EXTRACT_AFTER_ARGS=	-d ${WRKDIR}/${DISTNAME}
 NO_ARCH=		yes
 SUB_FILES=		${PORTNAME}.sh
 
 OPTIONS_DEFINE=		DEBUG XDOTOOL XSEL
 OPTIONS_DEFAULT=	XDOTOOL XSEL
 
 XDOTOOL_DESC=	Use the xdotool utility for auto-typing passwords
 XSEL_DESC=	Use the xsel utility for clipboard copying
 
 DEBUG_VARS=		config=Debug
 DEBUG_VARS_OFF=		config=Release
 XDOTOOL_RUN_DEPENDS=	xdotool:x11/xdotool
 XSEL_RUN_DEPENDS=	xsel:x11/xsel-conrad
 
 post-patch:
 	${REINPLACE_CMD} -e 's|sed\ -i|sed\ -i\ \"\"|g' ${WRKSRC}/Build/PrepMonoDev.sh
 
 do-build:
 	# Extract icons
 	(cd ${WRKSRC} && ${LOCALBASE}/bin/icotool -x KeePass/KeePass.ico)
 	# Prepare build
 	(cd ${WRKSRC}/Build && ${SH} PrepMonoDev.sh)
 	# Do build
 	(cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${LOCALBASE}/bin/xbuild /t:KeePass /p:Configuration=${CONFIG})
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/Build/KeePass/${CONFIG}/KeePass.exe ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/Ext/KeePass.config.xml ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/Ext/KeePass.exe.config ${STAGEDIR}${DATADIR}
 	@(cd ${WRKSRC}/Ext && ${COPYTREE_SHARE} XSL ${STAGEDIR}${DATADIR})
 .for size in 16 32 48 256
 	@${MKDIR} ${STAGEDIR}${LOCALBASE}/share/icons/hicolor/${size}x${size}/apps
 	${INSTALL_DATA} ${WRKSRC}/KeePass_*_${size}x${size}x32.png \
 		${STAGEDIR}${LOCALBASE}/share/icons/hicolor/${size}x${size}/apps/keepass.png
 .endfor
 
 .include <bsd.port.mk>
diff --git a/www/mod_mono/Makefile b/www/mod_mono/Makefile
index 2bd7fa13550b..164f0a1ceb9b 100644
--- a/www/mod_mono/Makefile
+++ b/www/mod_mono/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	mod_mono
 PORTVERSION=	3.13
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://download.mono-project.com/sources/${PORTNAME}/
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Apache module for serving ASP.NET applications
 WWW=		https://www.mono-project.com/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	xsp:www/xsp
 RUN_DEPENDS=	xsp:www/xsp
 
 USES=		apache libtool mono pkgconfig
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static --man=${PREFIX}/man
 INSTALL_TARGET=	install
 PLIST_SUB=	MOD_MONOCONFDIR=${MOD_MONOCONFDIR}
 
 MOD_MONOCONFDIR=${APACHEETCDIR}/Includes
 
 post-patch:
 	@${REINPLACE_CMD} 's|%%MOD_MONOCONFDIR%%|${PREFIX}/${MOD_MONOCONFDIR}|g' \
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} '/^mod_mono_la_LDFLAGS =/s/$$/ -avoid-version/' \
 		${WRKSRC}/src/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/www/xsp/Makefile b/www/xsp/Makefile
index 72a60f1562ee..f4ff7cbe4152 100644
--- a/www/xsp/Makefile
+++ b/www/xsp/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	xsp
 PORTVERSION=	4.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://download.mono-project.com/sources/${PORTNAME}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mono based web server
 WWW=		https://www.mono-project.com/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		gmake libtool mono pathfix pkgconfig sqlite
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_path_GMCS=${LOCALBASE}/bin/mcs
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 pre-install:
 	${MKDIR} ${STAGEDIR}${XSP_DOCROOT}
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtk-sharp20/Makefile b/x11-toolkits/gtk-sharp20/Makefile
index b0d7a5a4b8e7..cb22bc929141 100644
--- a/x11-toolkits/gtk-sharp20/Makefile
+++ b/x11-toolkits/gtk-sharp20/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	gtk-sharp
 PORTVERSION=	2.12.45
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://download.mono-project.com/sources/gtk-sharp212/
 PKGNAMESUFFIX=	20
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK+ and GNOME interfaces for the .NET runtime
 WWW=		https://www.mono-project.com/Gtk
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 RUN_DEPENDS=	p5-XML-LibXML>=0:textproc/p5-XML-LibXML
 
 USES=		gmake gnome libtool mono pathfix perl5 pkgconfig shebangfix
 USE_LDCONFIG=	yes
 USE_GNOME=	cairo gdkpixbuf2 gtk20 libglade2
 USE_PERL5=	run
 SHEBANG_FILES=	parser/*.pl
 
 GNU_CONFIGURE=	yes
 MAKE_ENV=	INSTALL_STRIP_FLAG=${STRIP}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \
 		${WRKSRC}/glib/glue/*.c
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtk-sharp30/Makefile b/x11-toolkits/gtk-sharp30/Makefile
index e890f5fbfd50..c3e83d36db36 100644
--- a/x11-toolkits/gtk-sharp30/Makefile
+++ b/x11-toolkits/gtk-sharp30/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	gtk-sharp
 PORTVERSION=	2.99.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME
 PKGNAMESUFFIX=	30
 
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	GTK+ and GNOME interfaces for the .NET runtime
 WWW=		https://www.mono-project.com/Gtk
 
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libinotify.so:devel/libinotify
 RUN_DEPENDS=	p5-XML-LibXML>=0:textproc/p5-XML-LibXML
 
 USES=		gettext-runtime gmake gnome libtool mono pathfix perl5 \
 		pkgconfig shebangfix tar:xz
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_GNOME=	cairo gdkpixbuf2 gtk30
 SHEBANG_FILES=	parser/*.pl
 USE_PERL5=	run
 MAKE_ENV=	INSTALL_STRIP_FLAG=${STRIP}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|gmcs|mcs|g' \
 		${WRKSRC}/configure
 
 .include <bsd.port.mk>