diff --git a/Mk/Uses/mono.mk b/Mk/Uses/mono.mk
index e2c659b01345..3382903eb370 100644
--- a/Mk/Uses/mono.mk
+++ b/Mk/Uses/mono.mk
@@ -1,236 +1,236 @@
 # mono (c#) support
 #
 # Feature:	mono
 # Usage:	USES=mono:ARGS
 # Valid ARGS:	nuget
 #
 # MAINTAINER=	mono@FreeBSD.org
 #
 # Arguments:
 #
 # build		Specifies that mono is only a build-time dependency.
 #
 # nuget		Specifies that the port uses nuget packages.
 #
 #		EXTRACT_ONLY is conditionally overridden to exclude all
 #		files with a '.nupkg' extension.
 #
 # Targets:
 #
 # makenuget	This target will output the NUGET_DEPENDS based on the
 #		port's packages.config file.
 #
 # makenupkg	This target will create nupkg-${NAME} files based on the
 # 		port's downloaded packages in ${NUGET_PACKAGEDIR}
 #
 # Variables overrideable by the port:
 #
 # NUGET_PACKAGEDIR	The directory in which the port expects the
 #			nuget packages to be available
 #			default: ${WRKSRC}/packages
 #
 # NUGET_LAYOUT		The directory layout of ${NUGET_PACKAGEDIR}:
 # 				legacy:
 # 					${NAME}
 # 					${NAME}.${VERSION}
 # 					${NAME.tl}/${VERSION}
 # 				flat:
 # 					${NAME}
 # 					${NAME:tl}
 # 				dotnet:
 # 					${NAME:tl}/${VERSION}
 # 			default: legacy
 #
 # NUGET_FEEDS		A list of nuget feed names
 #			default: NUGET
 #
 # ${NAME}_URL:		The base URL for the feed ${NAME}
 #			defaults:
 #				NUGET_URL=https://www.nuget.org/api/v2/
 #				${NAME}_URL=https://dotnet.myget.org/F/${NAME:tl:S/_/-/g}/api/v2/
 #
 # ${NAME}_FILE:		The file containing a list of nuget packages from
 # 			feed ${NAME} in the format:
 # 				${name}=${version}
 # 			default: ${PKGDIR}/nupkg-${NAME:tl}
 #
 # ${NAME}_DEPENDS:	The list of nuget packages from feed ${NAME} in the
 #			format:
 #				${name}=${version}
 #			defaults:
 #				NUGET_DEPENDS=${PAKET_DEPENDS}
 #
 # PAKET_PACKAGEDIR	The directory in which the port expects the
 # 			nuget packages (managed by paket) to be available
 #
 # PAKET_DEPENDS		The list of nuget packages from a nuget feed.  The
 # 			version used needs to be resolved (unlike how paket
 # 			works).  The format is:
 # 				${name}=${version}
 
 .if !defined(_INCLUDE_USES_MONO_MK)
 _INCLUDE_USES_MONO_MK=	yes
 
 .  if !empty(mono_ARGS:Nnuget:Nbuild)
 IGNORE=	USES=mono only supports optional arguments nuget and build
 .  endif
 
 # Set the location of the .wapi directory so we write to a location we
 # can always assume to be writable.
 MONO_SHARED_DIR=	${WRKDIR}
 CONFIGURE_ENV+=		MONO_SHARED_DIR="${MONO_SHARED_DIR}"
 MAKE_ENV+=		MONO_SHARED_DIR="${MONO_SHARED_DIR}" TZ=UTC
-BUILD_DEPENDS+=		mono:lang/mono
+BUILD_DEPENDS+=		mono:lang/mono${MONO_DEFAULT}
 .  if empty(mono_ARGS:Mbuild)
-RUN_DEPENDS+=		mono:lang/mono
+RUN_DEPENDS+=		mono:lang/mono${MONO_DEFAULT}
 .  endif
 
 # Set the location that webaps served by XSP should use.
 XSP_DOCROOT=		${PREFIX}/www/xsp
 
 # gac utilities
 GACUTIL=${LOCALBASE}/bin/gacutil /root ${PREFIX}/lib/ /gacdir ${PREFIX}/lib
 GACUTIL_INSTALL=${GACUTIL} /i
 GACUTIL_INSTALL_PACKAGE=${GACUTIL} /i /package 1.0 /package 2.0
 
 .  if ${mono_ARGS:Mnuget}
 MAKE_ENV+=	NUGET_PACKAGES=${NUGET_PACKAGEDIR}
 
 # TODO: add nuget as a Port, use it for makenupkg
 NUGET_EXE?=	${WRKDIR}/nuget.exe
 NUGET_LATEST_URL?=	https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
 
 _NUGET_PACKAGEDIR=	${WRKDIR}/.nuget/packages
 NUGET_PACKAGEDIR?=	${WRKSRC}/packages
 NUGET_LAYOUT?=		legacy
 NUGET_FEEDS?=		NUGET
 NUGET_URL?=		https://api.nuget.org/v3-flatcontainer/
 NUGET_VERSION?=		v3
 
 PAKET_PACKAGEDIR?=
 PAKET_DEPENDS?=
 NUGET_DEPENDS?=		${PAKET_DEPENDS}
 
 .    for feed in ${NUGET_FEEDS}
 ${feed}_DEPENDS?=
 ${feed}_FILE?=		${PKGDIR}/nupkg-${feed:tl}
 ${feed}_URL?=		https://dotnet.myget.org/F/${feed:tl:S/_/-/g}/api/v2/
 ${feed}_VERSION?=	v2
 .      if exists(${${feed}_FILE})
 ${feed}_EXTRA!=		${CAT} ${${feed}_FILE}
 .      else
 ${feed}_EXTRA=
 .      endif
 MAKENUPKG_ENV+=		${feed:tl}_URL="${${feed}_URL}" ${feed:tl}_VERSION="${${feed}_VERSION}"
 .      for depend in ${${feed}_DEPENDS} ${${feed}_EXTRA}
 .        if empty(_NUGET_DEPENDS:M${depend})
 id=		${depend:C/=.*$//}
 version=	${depend:C/^.*=//}
 group=		nuget_${depend:C/[.+=-]//g}
 nupkg=		${id:tl}.${version}.nupkg
 DISTFILES_${group}:=	${nupkg}:${group}
 .          if ${${feed}_VERSION} == v2
 MASTER_SITES_${group}:=	${${feed}_URL}package/${id}/${version}?dummy=/:${group}
 .          else
 MASTER_SITES_${group}:=	${${feed}_URL}${id:tl}/${version}/:${group}
 .          endif
 NUGET_NUPKGS_${group}:=	${nupkg}:${depend}
 NUPKGS_${id}:=	${NUPKGS_${id}} ${version}
 
 DISTFILES+=	${DISTFILES_nuget_${depend:S/.//g:S/-//g:S/=//g}}
 MASTER_SITES+=	${MASTER_SITES_nuget_${depend:S/.//g:S/-//g:S/=//g}}
 NUGET_NUPKGS+=	${NUGET_NUPKGS_nuget_${depend:S/.//g:S/-//g:S/=//g}}
 _NUGET_DEPENDS+=	${depend}
 .        endif
 .      endfor
 .    endfor
 
 EXTRACT_ONLY?=	${_DISTFILES:N*.nupkg}
 
 _USES_extract+=	600:nuget-extract
 nuget-extract:
 	@${MKDIR} ${_NUGET_PACKAGEDIR} ${PAKET_PACKAGEDIR}
 .    for nupkg in ${NUGET_NUPKGS}
 	@${MKDIR} ${_NUGET_PACKAGEDIR}/${nupkg:tl:C/^.*://:S|=|/|}
 	@tar -xf ${DISTDIR}/${nupkg:C/:.*$//} -C ${_NUGET_PACKAGEDIR}/${nupkg:tl:C/^.*://:S|=|/|} \
 		-s/%2B/\+/g -s/%2B/\+/g -s/%2B/\+/g \
 		--exclude '\[Content_Types\].xml' \
 		--exclude package/ \
 		--exclude _rels/
 	@${MV} ${_NUGET_PACKAGEDIR}/${nupkg:tl:C/^.*://:S|=|/|}/${nupkg:C/^.*://:C/=.*//}.nuspec \
 		${_NUGET_PACKAGEDIR}/${nupkg:tl:C/^.*://:S|=|/|}/${nupkg:tl:C/^.*://:C/=.*//}.nuspec
 	@${CP} ${DISTDIR}/${nupkg:C/:.*$//} ${_NUGET_PACKAGEDIR}/${nupkg:tl:C/^.*://:S|=|/|}/${nupkg:tl:C/^.*://:S/=/./}.nupkg
 	@openssl dgst -sha512 -binary ${DISTDIR}/${nupkg:C/:.*$//} | openssl enc -base64 | ${TR} -d "\n" \
 		> ${_NUGET_PACKAGEDIR}/${nupkg:tl:C/^.*://:S|=|/|}/${nupkg:tl:C/^.*://:S/=/./}.nupkg.sha512
 .      if ${NUGET_LAYOUT} == legacy
 	@${CP} -a ${_NUGET_PACKAGEDIR}/${nupkg:tl:C/^.*://:S|=|/|}/ ${_NUGET_PACKAGEDIR}/${nupkg:C/^.*://:S|=|.|}/
 	@${CP} -a ${_NUGET_PACKAGEDIR}/${nupkg:tl:C/^.*://:S|=|/|}/ ${_NUGET_PACKAGEDIR}/${nupkg:C/^.*://:C|=.*||}/
 .        if ${nupkg} != ${nupkg:tl}
 	@(cd ${_NUGET_PACKAGEDIR}/${nupkg:C/^.*://:C|=.*||}; \
 		${MV} ${nupkg:tl:C/^.*://:C/=.*//}.nuspec ${nupkg:C/^.*://:C/=.*//}.nuspec; \
 		${MV} ${nupkg:tl:C/^.*://:S/=/./}.nupkg ${nupkg:C/^.*://:S/=/./}.nupkg; \
 		${MV} ${nupkg:tl:C/^.*://:S/=/./}.nupkg.sha512 ${nupkg:C/^.*://:S/=/./}.nupkg.sha512)
 	@(cd ${_NUGET_PACKAGEDIR}/${nupkg:C/^.*://:S|=|.|}; \
 		${MV} ${nupkg:tl:C/^.*://:C/=.*//}.nuspec ${nupkg:C/^.*://:C/=.*//}.nuspec; \
 		${MV} ${nupkg:tl:C/^.*://:S/=/./}.nupkg ${nupkg:C/^.*://:S/=/./}.nupkg; \
 		${MV} ${nupkg:tl:C/^.*://:S/=/./}.nupkg.sha512 ${nupkg:C/^.*://:S/=/./}.nupkg.sha512)
 .        endif
 .      elif ${NUGET_LAYOUT} == flat
 	@${CP} -a ${_NUGET_PACKAGEDIR}/${nupkg:tl:C/^.*://:S|=|/|}/ ${_NUGET_PACKAGEDIR}/${nupkg:tl:C/^.*://:C|=.*||}/
 	@${RM} -r ${_NUGET_PACKAGEDIR}/${nupkg:tl:C/^.*://:S|=|/|}
 .        if ${nupkg} != ${nupkg:tl}
 	@${CP} -a ${_NUGET_PACKAGEDIR}/${nupkg:tl:C/^.*://:C|=.*||}/ ${_NUGET_PACKAGEDIR}/${nupkg:C/^.*://:C|=.*||}/
 	@(cd ${_NUGET_PACKAGEDIR}/${nupkg:C/^.*://:C|=.*||}; \
 		${MV} ${nupkg:tl:C/^.*://:C/=.*//}.nuspec ${nupkg:C/^.*://:C/=.*//}.nuspec; \
 		${MV} ${nupkg:tl:C/^.*://:S/=/./}.nupkg ${nupkg:C/^.*://:S/=/./}.nupkg; \
 		${MV} ${nupkg:tl:C/^.*://:S/=/./}.nupkg.sha512 ${nupkg:C/^.*://:S/=/./}.nupkg.sha512)
 .        endif
 .      endif
 .    endfor
 	@${RLN} ${_NUGET_PACKAGEDIR} ${NUGET_PACKAGEDIR}
 	@${TOUCH} ${WRKDIR}/.nuget-sentinal
 
 _USES_extract+=	601:paket-extract
 paket-extract:
 .    for nupkg in ${PAKET_DEPENDS}
 	@${RLN} ${_NUGET_PACKAGEDIR}/${nupkg:tl:S|=|/|} ${PAKET_PACKAGEDIR}/${nupkg:C/=.*//}
 	@(cd ${_NUGET_PACKAGEDIR}/${nupkg:tl:C/^.*://:S|=|/|}; \
 		${CP} ${nupkg:tl:C/^.*://:C/=.*//}.nuspec ${nupkg:C/^.*://:C/=.*//}.nuspec; \
 		${CP} ${nupkg:tl:C/^.*://:S/=/./}.nupkg ${nupkg:C/^.*://:S/=/./}.nupkg; \
 		${CP} ${nupkg:tl:C/^.*://:S/=/./}.nupkg.sha512 ${nupkg:C/^.*://:S/=/./}.nupkg.sha512)
 .    endfor
 .  endif
 
 makenuget: patch
 	@${FIND} ${WRKSRC} -name packages.config | \
 		${XARGS} ${SED} -nE 's|.*<package id="([^"]+)" version="([^"]+)"[^/]*/>.*|\1=\2|gp' | \
 		${SORT} -u | \
 		${SED} \
 			-e '1s|^|NUGET_DEPENDS=	|' \
 			-e '2,$$s|^|		|g' \
 			-e '$$!s|$$| \\|g'
 
 makenupkg:
 	@${RM} ${WRKDIR}/nupkg-*
 	@for nuspec in `${FIND} ${_NUGET_PACKAGEDIR} -name '*.nuspec'`; do \
 		name="`${SED} -nE 's|.*<id>(.*)</id>.*|\1|p' $$nuspec`"; \
 		version="`${SED} -nE 's|.*<version>(.*)</version>.*|\1|p' $$nuspec`"; \
 		echo $$name=$$version ; \
 	done | ${SORT} -u | ${SETENV} ${MAKENUPKG_ENV} ${XARGS} -n1 sh -c ' \
 		for feed in ${NUGET_FEEDS:MNUGET:tl} ${NUGET_FEEDS:NNUGET:tl}; do \
 			if eval [ "\$${$${feed}_VERSION}" = v2 ]; then \
 				eval url="\$${$${feed}_URL}package/$${0%%=*}/$${0##*=}"; \
 			else \
 				eval url="\$${$${feed}_URL}$${0%%=*}/$${0##*=}/$${0%%=*}.$${0##*=}.nupkg"; \
 			fi; \
 			if curl --output /dev/null --silent --head --fail $$url; then\
 				${ECHO_CMD} $$0 >> ${WRKDIR}/nupkg-$$feed; \
 				found=yes; \
 				break; \
 			fi; \
 		done; \
 		if [ -z "$$found" ]; then \
 			echo "$$0: no feed found"; \
 			exit 1; \
 		fi'
 .endif
diff --git a/deskutils/cairo-dock-plugins/Makefile b/deskutils/cairo-dock-plugins/Makefile
index 8c37139b345c..a0a76757bac3 100644
--- a/deskutils/cairo-dock-plugins/Makefile
+++ b/deskutils/cairo-dock-plugins/Makefile
@@ -1,139 +1,139 @@
 PORTNAME=	cairo-dock-plugins
 PORTVERSION=	3.4.1
 PORTREVISION=	13
 CATEGORIES=	deskutils
 
 PATCH_SITES=	https://github.com/Cairo-Dock/cairo-dock-plug-ins/commit/
 PATCHFILES=	d08541a0afb4377ce2f35feb280fbe443870b587.patch:-p1
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Cairo-Dock-Plugins for Cairo-Dock
 WWW=		https://www.glx-dock.org/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libgldi.so:deskutils/cairo-dock
 RUN_DEPENDS=	wget:ftp/wget
 
 USES=		cmake gettext gnome localbase:ldflags pkgconfig python xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	Cairo-Dock
 GH_PROJECT=	cairo-dock-plug-ins
 USE_GNOME=	glib20 gtk30 librsvg2 libxml2
 USE_LDCONFIG=	yes
 USE_XORG=	xrender
 
 CMAKE_ARGS=	-DROOT_PREFIX:PATH=${STAGEDIR} \
 		-Denable-weblets:BOOL=FALSE
 
 GNU_CONFIGURE=	yes
 
 DATADIR=	${PREFIX}/share/cairo-dock
 
 PLIST_SUB=	PYVER="${PYTHON_VERSION:S/thon//}"
 
 OPTIONS_DEFAULT=	GMENU
 OPTIONS_GROUP=		INTEGR PLUGINS ADDON TPI
 OPTIONS_GROUP_ADDON=	EXIF ICAL UPOWER
 OPTIONS_GROUP_INTEGR=	GNOME_INTEGRATION XFCE_INTEGRATION
 OPTIONS_GROUP_PLUGINS=	ALSA_MIXER GMENU IMPULSE KEYBOARD_INDICATOR \
 			MAIL SOUND_EFFECTS XGAMMA ZEITGEIST
 #OPTIONS_GROUP_TPI=	PYTHON RUBY MONO VALA
 OPTIONS_SUB=		yes
 
 ADDON_DESC=		Add On
 ALSA_MIXER_DESC=	Alsa-Mixer applet
 EXIF_DESC=		Read file meta-data
 GMENU_DESC=		GMenu applet
 GNOME_INTEGRATION_DESC=	GNOME integration support
 ICAL_DESC=		IETF Calendaring and Scheduling protocols
 IMPULSE_DESC=		Impulse applet
 INTEGR_DESC=		Integration plug-ins
 KEYBOARD_INDICATOR_DESC=	 Keyboard-indicator applet
 MAIL_DESC=		Mail applet
 #MONO_DESC=		Mono interface
 PLUGINS_DESC=		Plug-ins
 #PYTHON_DESC=		Python interface
 #RUBY_DESC=		Ruby interface
 SOUND_EFFECTS_DESC=	Sound Effects applet
 #TERMINAL_DESC=		Terminal applet
 #TPI_DESC=		Third Party Interfaces
 UPOWER_DESC=		D-Bus daemon for power management tasks
 #VALA_DESC=		Vala interface
 XFCE_INTEGRATION_DESC=	XFCE integration support
 XGAMMA_DESC=		Xgamma applet
 ZEITGEIST_DESC=		User logs activities
 
 ALSA_MIXER_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_MIXER_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
 ALSA_MIXER_CMAKE_BOOL=	enable-alsa-mixer
 EXIF_LIB_DEPENDS=	libexif.so:graphics/libexif
 EXIF_CMAKE_BOOL=	enable-exif-support
 GMENU_LIB_DEPENDS=	libgnome-menu-3.so:x11/gnome-menus
 GMENU_CMAKE_BOOL=	enable-gmenu
 #GNOME_INTEGRATION_LIB_DEPENDS=
 GNOME_INTEGRATION_CMAKE_BOOL=	enable-gnome-integration
 ICAL_LIB_DEPENDS=	libical.so:devel/libical
 ICAL_CMAKE_BOOL=	enable-ical-support
 IMPULSE_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 IMPULSE_CMAKE_BOOL=	enable-impulse
 KEYBOARD_INDICATOR_LIB_DEPENDS=	libexif.so:graphics/libexif \
 				libxklavier.so:x11/libxklavier
 KEYBOARD_INDICATOR_CMAKE_BOOL=	enable-keyboard-indicator
 # libetpan 1.9.4 replaces libetpan-config with libetpan.pc
 MAIL_BUILD_DEPENDS=	libetpan>=1.9.4:mail/libetpan
 MAIL_LIB_DEPENDS=	libetpan.so:mail/libetpan
 MAIL_CMAKE_BOOL=	enable-mail
-#MONO_BUILD_DEPENDS=	mono:lang/mono
-#MONO_RUN_DEPENDS=	mono:lang/mono
+#MONO_BUILD_DEPENDS=	mono:lang/mono${MONO_DEFAULT}
+#MONO_RUN_DEPENDS=	mono:lang/mono${MONO_DEFAULT}
 #MONO_CMAKE_BOOL=	enable-mono-interface
 CMAKE_ARGS+=		-Denable-mono-interface:BOOL=FALSE
 #PYTHON_LIB_DEPENDS=
 #PYTHON_CMAKE_BOOL=	enable-python-interface
 CMAKE_ARGS+=		-Denable-python-interface:BOOL=FALSE
 #RUBY_LIB_DEPENDS=
 #RUBY_CMAKE_BOOL=	enable-ruby-interface
 CMAKE_ARGS+=		-Denable-ruby-interface:BOOL=FALSE
 SOUND_EFFECTS_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 SOUND_EFFECTS_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
 SOUND_EFFECTS_CMAKE_BOOL=	enable-sound-effects
 # Needs newer vte
 #TERMINAL_LIB_DEPENDS=	vte:x11-toolkits/vte
 #TERMINAL_CMAKE_BOOL=	enable-terminal
 UPOWER_LIB_DEPENDS=	libupower-glib.so:sysutils/upower
 UPOWER_CMAKE_BOOL=	enable-upower-support
 #VALA_LIB_DEPENDS=
 #VALA_CMAKE_BOOL=	enable-vala-interface
 CMAKE_ARGS+=		-Denable-vala-interface:BOOL=FALSE
 XFCE_INTEGRATION_LIB_DEPENDS=	libexif.so:graphics/libexif
 XFCE_INTEGRATION_CMAKE_BOOL=	enable-xfce-integration
 XGAMMA_RUN_DEPENDS=	xgamma:x11/xgamma
 XGAMMA_CMAKE_BOOL=	enable-xgamma
 ZEITGEIST_LIB_DEPENDS=	libzeitgeist-2.0.so:sysutils/zeitgeist
 ZEITGEIST_CMAKE_BOOL=	enable-recent-events
 
 ICONS_PACKAGE=	cairo-dock-plugins-png-icons
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
 post-patch:
 	@${FIND} ${WRKSRC} -type f \( -name "*.c" -o -name "*.conf" \
 		-o -name netspeed -o -name nvidia-config -o -name "*.sh" \
 		-o -name "*.rb" \) | ${XARGS} ${REINPLACE_CMD} -i.orig -e \
 	    's|/bin/bash|${LOCALBASE}/bin/bash|g; \
 	     s|/usr/bin/python|${PYTHON_CMD}|g; \
 	     s|/usr/bin/ruby|${LOCALBASE}/bin/ruby|g; \
 	     s|/usr/share/applications|${LOCALBASE}/share/applications|g; \
 	     s|/usr/share/cairo-dock|${LOCALBASE}/share/cairo-dock|g'
 
 #post-install:
 #.if defined(VALA)
 #	${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig/CDApplet.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/
 #.endif
 
 .include <bsd.port.mk>
diff --git a/devel/dbus-sharp/Makefile b/devel/dbus-sharp/Makefile
index 09668d47e5ac..b266d783624d 100644
--- a/devel/dbus-sharp/Makefile
+++ b/devel/dbus-sharp/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	dbus-sharp
 PORTVERSION=	0.8.1
-PORTREVISION=	1
 DISTVERSIONPREFIX=v
+PORTREVISION=	2
 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 aaa755f80c44..ffdb9f36c5ae 100644
--- a/devel/log4net/Makefile
+++ b/devel/log4net/Makefile
@@ -1,42 +1,42 @@
 PORTNAME=	log4net
 PORTVERSION=	1.2.10
-PORTREVISION=	3
+PORTREVISION=	4
 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 fbe0b6c89bf5..4bea54ea870b 100644
--- a/devel/mono-addins/Makefile
+++ b/devel/mono-addins/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	mono-addins
 PORTVERSION=	1.3
-PORTREVISION=	2
 DISTVERSIONPREFIX=	${PORTNAME}-
+PORTREVISION=	3
 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 27af5084cbe7..c5c1df232b55 100644
--- a/devel/msbuild/Makefile
+++ b/devel/msbuild/Makefile
@@ -1,47 +1,48 @@
 PORTNAME=	msbuild
 DISTVERSIONPREFIX=	v
 DISTVERSION=	15.8-preview
+PORTREVISION=	1
 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 e97dfdcd32a3..44b1cfeda10d 100644
--- a/devel/nant/Makefile
+++ b/devel/nant/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	nant
 PORTVERSION=	0.92
 DISTVERSIONSUFFIX=	-src
-PORTREVISION=	2
+PORTREVISION=	3
 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 a7d4033f5cf1..00e4549f4352 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=	2
+PORTREVISION=	3
 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 809e82ec50b0..d751073e8f5c 100644
--- a/devel/ndesk-dbus/Makefile
+++ b/devel/ndesk-dbus/Makefile
@@ -1,25 +1,25 @@
 PORTNAME=	ndesk-dbus
 PORTVERSION=	0.6.1a
-PORTREVISION=	1
+PORTREVISION=	2
 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 cb81949e0cb0..cdb44e4418bd 100644
--- a/devel/ndesk-options/Makefile
+++ b/devel/ndesk-options/Makefile
@@ -1,19 +1,19 @@
 PORTNAME=	ndesk-options
 PORTVERSION=	0.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 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 38effddce8cd..aae9627a1bef 100644
--- a/devel/newtonsoft-json/Makefile
+++ b/devel/newtonsoft-json/Makefile
@@ -1,48 +1,48 @@
 PORTNAME=	newtonsoft-json
 PORTVERSION=	9.0.1
-PORTREVISION=	2
+PORTREVISION=	3
 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 aed47ce0f118..1a6ed3967347 100644
--- a/devel/nini/Makefile
+++ b/devel/nini/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	nini
 PORTVERSION=	1.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 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 6d129dbdd256..7df887d603cf 100644
--- a/devel/notify-sharp/Makefile
+++ b/devel/notify-sharp/Makefile
@@ -1,24 +1,25 @@
 PORTNAME=	notify-sharp
 PORTVERSION=	3.0.3
+PORTREVISION=	1
 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/devel/simian/Makefile b/devel/simian/Makefile
index 21eb87e65b3d..df6a730fce9e 100644
--- a/devel/simian/Makefile
+++ b/devel/simian/Makefile
@@ -1,90 +1,90 @@
 PORTNAME=	simian
 PORTVERSION=	2.5.10
 CATEGORIES=	devel java
 MASTER_SITES=	http://www.harukizaemon.com/simian/
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Similarity analyser for source and other text files
 WWW=		https://www.harukizaemon.com/simian/
 
 LICENSE=	SIMIAN
 LICENSE_NAME=	SIMIAN SOFTWARE LICENSE
 LICENSE_FILE=	${WRKSRC}/license.pdf
 # Have to agree to license before download
 LICENSE_PERMS=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell no-auto-accept
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
 SUB_FILES=	simian
 SUB_LIST+=	VERSION=${PORTVERSION}
 PLIST_SUB+=	VERSION=${PORTVERSION}
 
 PORTDOCS=	changes.html features.html \
 		get_dotnet.png get_it_now.html \
 		get_java_blue-button.gif index.html installation.html \
 		simian.dtd simian.jpg simian.xsl \
 		javadoc
 
 OPTIONS_DEFINE=	DOCS
 OPTIONS_SINGLE=	LANG
 OPTIONS_SINGLE_LANG=	JAVA MONO
 
 OPTIONS_DEFAULT=	JAVA
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MJAVA}
 USE_JAVA=	yes
 PLIST_SUB+=	JAVA=""
 SUB_LIST+=	JAVA=""
 .else
 PLIST_SUB+=	JAVA="@comment "
 SUB_LIST+=	JAVA="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMONO}
-RUN_DEPENDS+=	mono:lang/mono
+RUN_DEPENDS+=	mono:lang/mono${MONO_DEFAULT}
 PLIST_SUB+=	MONO=""
 SUB_LIST+=	MONO=""
 .else
 PLIST_SUB+=	MONO="@comment "
 SUB_LIST+=	MONO="@comment "
 .endif
 
 pre-fetch:
 .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
 .if !defined(PACKAGE_BUILDING) && (!defined(SIMIAN_AGREE_LICENSE) || ${SIMIAN_AGREE_LICENSE} != "yes")
 	@${ECHO}	By downloading this version, you agree to the terms
 	@${ECHO}	and conditions set out in the license agreement and
 	@${ECHO}	you agree that, should you wish to continue using
 	@${ECHO}	Simian for other than open source projects, non-
 	@${ECHO}	commercial projects or evaluation purposes for a
 	@${ECHO}	period greater than 15 days, you will purchase a
 	@${ECHO}	license as described following URL.
 	@${ECHO}
 	@${ECHO}	http://www.harukizaemon.com/simian/license.pdf
 	@${ECHO}
 	@${ECHO}	Build with SIMIAN_AGREE_LICENSE=yes to continue.
 	@${ECHO}
 	@${FALSE}
 .endif
 .endif
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/xsl/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/simian.xsl ${STAGEDIR}${PREFIX}/share/xsl/${PORTNAME}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/simian/bin
 	${INSTALL_SCRIPT} ${WRKDIR}/simian ${STAGEDIR}${PREFIX}/bin/simian
 
 do-install-JAVA-on:
 	${INSTALL_DATA} ${WRKSRC}/bin/simian-${PORTVERSION}.jar ${STAGEDIR}${PREFIX}/simian/bin
 
 do-install-MONO-on:
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/*.dll ${STAGEDIR}${PREFIX}/simian/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/simian-${PORTVERSION}.exe ${STAGEDIR}${PREFIX}/simian/bin
 
 do-install-DOCS-on:
 	cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
diff --git a/editors/bless/Makefile b/editors/bless/Makefile
index 4b089fb16d85..1269dcf77f70 100644
--- a/editors/bless/Makefile
+++ b/editors/bless/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	bless
 PORTVERSION=	0.6.3
 PORTEPOCH=	1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 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 f21ec15999c8..92bda6a78103 100644
--- a/emulators/mesen/Makefile
+++ b/emulators/mesen/Makefile
@@ -1,82 +1,82 @@
 PORTNAME=	mesen
 DISTVERSION=	0.9.8-4
-PORTREVISION=	2
 DISTVERSIONSUFFIX=	-g4c701ad6
+PORTREVISION=	3
 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_RUN_DEPENDS=	mono:lang/mono
+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 ad2a7783eadd..61f6ff1ab382 100644
--- a/games/gbrainy/Makefile
+++ b/games/gbrainy/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	gbrainy
 DISTVERSION=	2.4.6
+PORTREVISION=	1
 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 975863c09f79..d99018e3d64f 100644
--- a/games/openbve/Makefile
+++ b/games/openbve/Makefile
@@ -1,85 +1,86 @@
 PORTNAME=	${GH_PROJECT:tl}
 PORTVERSION=	1.9.1.1
+PORTREVISION=	1
 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 b753e2ea65b4..1c1311caef9d 100644
--- a/games/openclaw/Makefile
+++ b/games/openclaw/Makefile
@@ -1,77 +1,77 @@
 PORTNAME=	OpenClaw
 DISTVERSION=	0.3-98
 DISTVERSIONSUFFIX=	-g3586dfa
-PORTREVISION=	2
+PORTREVISION=	3
 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 7c2c0fdf8b27..9ba92d28a142 100644
--- a/games/openra/Makefile
+++ b/games/openra/Makefile
@@ -1,86 +1,86 @@
 PORTNAME=	openra
 DISTVERSIONPREFIX=	release-
 DISTVERSION=	20200503
-PORTREVISION=	5
+PORTREVISION=	6
 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 3e8705564463..4b9611166d76 100644
--- a/graphics/nplot/Makefile
+++ b/graphics/nplot/Makefile
@@ -1,47 +1,47 @@
 PORTNAME=	nplot
 PORTVERSION=	0.9.11
-PORTREVISION=	1
+PORTREVISION=	2
 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 f6a6c370ff29..10a8b7d497ac 100644
--- a/graphics/pinta/Makefile
+++ b/graphics/pinta/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	pinta
 PORTVERSION=	1.7.1
-PORTREVISION=	1
+PORTREVISION=	2
 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 be6ec76afab4..5a601915c5a9 100644
--- a/irc/smartirc4net/Makefile
+++ b/irc/smartirc4net/Makefile
@@ -1,18 +1,18 @@
 PORTNAME=	smartirc4net
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 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 e61a3e8ae493..166de3431106 100644
--- a/irc/smuxi/Makefile
+++ b/irc/smuxi/Makefile
@@ -1,46 +1,46 @@
 PORTNAME=	smuxi
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 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 397f49249e98..f3c1282ce179 100644
--- a/lang/fsharp/Makefile
+++ b/lang/fsharp/Makefile
@@ -1,39 +1,40 @@
 PORTNAME=	fsharp
 PORTVERSION=	10.2.1
+PORTREVISION=	1
 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 a272af162842..a012d48b7419 100644
--- a/lang/mono-basic/Makefile
+++ b/lang/mono-basic/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	mono-basic
 PORTVERSION=	4.7
+PORTREVISION=	1
 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 94101a080512..241694937b54 100644
--- a/misc/gedkeeper/Makefile
+++ b/misc/gedkeeper/Makefile
@@ -1,65 +1,66 @@
 PORTNAME=	gedkeeper
 PORTVERSION=	2.25.2
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 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 2e2c86625d3d..4555b63c2bab 100644
--- a/net/avahi-sharp/Makefile
+++ b/net/avahi-sharp/Makefile
@@ -1,27 +1,27 @@
-PORTREVISION=	0
+PORTREVISION=	1
 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 1cadeb5227f5..5e0fadb9906b 100644
--- a/net/ntpa/Makefile
+++ b/net/ntpa/Makefile
@@ -1,69 +1,69 @@
 PORTNAME=	ntpa
 PORTVERSION=	0.8.2
-PORTREVISION=	4
+PORTREVISION=	5
 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 7919d218292b..5b7475af85ea 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=	6
+PORTREVISION=	7
 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 d376ece81127..78494a89bf07 100644
--- a/security/keepass-plugin-keepassrpc/Makefile
+++ b/security/keepass-plugin-keepassrpc/Makefile
@@ -1,39 +1,40 @@
 PORTNAME=	keepassrpc
 PORTVERSION=	1.8.0
 DISTVERSIONPREFIX=v
+PORTREVISION=	1
 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 bdacf81c335e..1fd73c0997a7 100644
--- a/security/keepass/Makefile
+++ b/security/keepass/Makefile
@@ -1,68 +1,69 @@
 PORTNAME=	keepass
 PORTVERSION=	2.54
+PORTREVISION=	1
 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 fc131bc3c384..2bd7fa13550b 100644
--- a/www/mod_mono/Makefile
+++ b/www/mod_mono/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	mod_mono
 PORTVERSION=	3.13
+PORTREVISION=	1
 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 8e772593d7cc..72a60f1562ee 100644
--- a/www/xsp/Makefile
+++ b/www/xsp/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	xsp
 PORTVERSION=	4.5
+PORTREVISION=	1
 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 dc2cbd290b27..b0d7a5a4b8e7 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=	4
+PORTREVISION=	5
 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 7c7a2d72342d..e890f5fbfd50 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=	4
+PORTREVISION=	5
 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>