lang/mono: respect MONO_DEFAULT in consumers

PR:		251795

36 files changed, 40 insertions, 29 deletions

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
@@ -80,9 +80,9 @@ IGNORE=	USES=mono only supports optional arguments nuget and build
 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.
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
@@ -85,8 +85,8 @@ KEYBOARD_INDICATOR_CMAKE_BOOL=	enable-keyboard-indicator
 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=
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,7 +1,7 @@
 PORTNAME=	dbus-sharp
 PORTVERSION=	0.8.1
-PORTREVISION=	1
 DISTVERSIONPREFIX=v
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	devel gnome
 
diff --git a/devel/log4net/Makefile b/devel/log4net/Makefile
index aaa755f80c44..ffdb9f36c5ae 100644
--- a/devel/log4net/Makefile
+++ b/devel/log4net/Makefile
@@ -1,6 +1,6 @@
 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}
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,7 +1,7 @@
 PORTNAME=	mono-addins
 PORTVERSION=	1.3
-PORTREVISION=	2
 DISTVERSIONPREFIX=	${PORTNAME}-
+PORTREVISION=	3
 CATEGORIES=	devel
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/devel/msbuild/Makefile b/devel/msbuild/Makefile
index 27af5084cbe7..c5c1df232b55 100644
--- a/devel/msbuild/Makefile
+++ b/devel/msbuild/Makefile
@@ -1,6 +1,7 @@
 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
diff --git a/devel/nant/Makefile b/devel/nant/Makefile
index e97dfdcd32a3..44b1cfeda10d 100644
--- a/devel/nant/Makefile
+++ b/devel/nant/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	nant
 PORTVERSION=	0.92
 DISTVERSIONSUFFIX=	-src
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	SF
 
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,6 +1,6 @@
 PORTNAME=	ndesk-dbus-glib
 PORTVERSION=	0.4.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://www.ndesk.org/archive/ndesk-dbus/
 
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,6 +1,6 @@
 PORTNAME=	ndesk-dbus
 PORTVERSION=	0.6.1a
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.ndesk.org/archive/ndesk-dbus/
 
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,6 +1,6 @@
 PORTNAME=	ndesk-options
 PORTVERSION=	0.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.ndesk.org/archive/${PORTNAME}/
 
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,6 +1,6 @@
 PORTNAME=	newtonsoft-json
 PORTVERSION=	9.0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/devel/nini/Makefile b/devel/nini/Makefile
index aed47ce0f118..1a6ed3967347 100644
--- a/devel/nini/Makefile
+++ b/devel/nini/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	nini
 PORTVERSION=	1.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	SF/nini/Nini/${PORTVERSION}
 DISTNAME=	Nini-${PORTVERSION}
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,5 +1,6 @@
 PORTNAME=	notify-sharp
 PORTVERSION=	3.0.3
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://www.meebey.net/projects/notify-sharp/downloads/
 
diff --git a/devel/simian/Makefile b/devel/simian/Makefile
index 21eb87e65b3d..df6a730fce9e 100644
--- a/devel/simian/Makefile
+++ b/devel/simian/Makefile
@@ -44,7 +44,7 @@ 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
diff --git a/editors/bless/Makefile b/editors/bless/Makefile
index 4b089fb16d85..1269dcf77f70 100644
--- a/editors/bless/Makefile
+++ b/editors/bless/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	bless
 PORTVERSION=	0.6.3
 PORTEPOCH=	1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/emulators/mesen/Makefile b/emulators/mesen/Makefile
index f21ec15999c8..92bda6a78103 100644
--- a/emulators/mesen/Makefile
+++ b/emulators/mesen/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	mesen
 DISTVERSION=	0.9.8-4
-PORTREVISION=	2
 DISTVERSIONSUFFIX=	-g4c701ad6
+PORTREVISION=	3
 CATEGORIES=	emulators
 
 MAINTAINER=	ports@FreeBSD.org
@@ -41,8 +41,8 @@ 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
 
diff --git a/games/gbrainy/Makefile b/games/gbrainy/Makefile
index ad2a7783eadd..61f6ff1ab382 100644
--- a/games/gbrainy/Makefile
+++ b/games/gbrainy/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	gbrainy
 DISTVERSION=	2.4.6
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	games
 MASTER_SITES=	https://gent.softcatala.org/jmas/gbrainy/
diff --git a/games/openbve/Makefile b/games/openbve/Makefile
index 975863c09f79..d99018e3d64f 100644
--- a/games/openbve/Makefile
+++ b/games/openbve/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	${GH_PROJECT:tl}
 PORTVERSION=	1.9.1.1
+PORTREVISION=	1
 CATEGORIES=	games
 
 MAINTAINER=	danfe@FreeBSD.org
diff --git a/games/openclaw/Makefile b/games/openclaw/Makefile
index b753e2ea65b4..1c1311caef9d 100644
--- a/games/openclaw/Makefile
+++ b/games/openclaw/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	OpenClaw
 DISTVERSION=	0.3-98
 DISTVERSIONSUFFIX=	-g3586dfa
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 
 PATCH_SITES=	https://github.com/valpackett/${GH_PROJECT}/commit/
diff --git a/games/openra/Makefile b/games/openra/Makefile
index 7c2c0fdf8b27..9ba92d28a142 100644
--- a/games/openra/Makefile
+++ b/games/openra/Makefile
@@ -1,7 +1,7 @@
 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
diff --git a/graphics/nplot/Makefile b/graphics/nplot/Makefile
index 3e8705564463..4b9611166d76 100644
--- a/graphics/nplot/Makefile
+++ b/graphics/nplot/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	nplot
 PORTVERSION=	0.9.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 
 MAINTAINER=	cs@innolan.dk
diff --git a/graphics/pinta/Makefile b/graphics/pinta/Makefile
index f6a6c370ff29..10a8b7d497ac 100644
--- a/graphics/pinta/Makefile
+++ b/graphics/pinta/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	pinta
 PORTVERSION=	1.7.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	https://github.com/PintaProject/Pinta/releases/download/${PORTVERSION}/
 
diff --git a/irc/smartirc4net/Makefile b/irc/smartirc4net/Makefile
index be6ec76afab4..5a601915c5a9 100644
--- a/irc/smartirc4net/Makefile
+++ b/irc/smartirc4net/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	smartirc4net
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	irc
 MASTER_SITES=	https://smuxi.im/jaws/data/files/
 
diff --git a/irc/smuxi/Makefile b/irc/smuxi/Makefile
index e61a3e8ae493..166de3431106 100644
--- a/irc/smuxi/Makefile
+++ b/irc/smuxi/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	smuxi
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	irc
 MASTER_SITES=	http://www.smuxi.org/jaws/data/files/
 
diff --git a/lang/fsharp/Makefile b/lang/fsharp/Makefile
index 397f49249e98..f3c1282ce179 100644
--- a/lang/fsharp/Makefile
+++ b/lang/fsharp/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	fsharp
 PORTVERSION=	10.2.1
+PORTREVISION=	1
 CATEGORIES=	lang
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
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,5 +1,6 @@
 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}/
diff --git a/misc/gedkeeper/Makefile b/misc/gedkeeper/Makefile
index 94101a080512..241694937b54 100644
--- a/misc/gedkeeper/Makefile
+++ b/misc/gedkeeper/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	gedkeeper
 PORTVERSION=	2.25.2
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	misc
 
 MAINTAINER=	danfe@FreeBSD.org
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,4 +1,4 @@
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	net dns
 PKGNAMESUFFIX=	-sharp
 
diff --git a/net/ntpa/Makefile b/net/ntpa/Makefile
index 1cadeb5227f5..5e0fadb9906b 100644
--- a/net/ntpa/Makefile
+++ b/net/ntpa/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ntpa
 PORTVERSION=	0.8.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net
 MASTER_SITES=	http://dist1.innolan.net/ \
 		http://dist2.innolan.net/
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,6 +1,6 @@
 PORTNAME=	gnome-keyring-sharp
 PORTVERSION=	1.0.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	security
 MASTER_SITES=	http://www.go-mono.com/archive/${PORTNAME}/
 
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,6 +1,7 @@
 PORTNAME=	keepassrpc
 PORTVERSION=	1.8.0
 DISTVERSIONPREFIX=v
+PORTREVISION=	1
 CATEGORIES=	security
 PKGNAMEPREFIX=	keepass-plugin-
 
diff --git a/security/keepass/Makefile b/security/keepass/Makefile
index bdacf81c335e..1fd73c0997a7 100644
--- a/security/keepass/Makefile
+++ b/security/keepass/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	keepass
 PORTVERSION=	2.54
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	SF/${PORTNAME}/KeePass%202.x/${PORTVERSION}
 DISTNAME=	KeePass-${PORTVERSION}-Source
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,5 +1,6 @@
 PORTNAME=	mod_mono
 PORTVERSION=	3.13
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://download.mono-project.com/sources/${PORTNAME}/
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
diff --git a/www/xsp/Makefile b/www/xsp/Makefile
index 8e772593d7cc..72a60f1562ee 100644
--- a/www/xsp/Makefile
+++ b/www/xsp/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	xsp
 PORTVERSION=	4.5
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://download.mono-project.com/sources/${PORTNAME}/
 
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,6 +1,6 @@
 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
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,6 +1,6 @@
 PORTNAME=	gtk-sharp
 PORTVERSION=	2.99.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME
 PKGNAMESUFFIX=	30