diff --git a/x11-toolkits/gtk-sharp20/Makefile b/x11-toolkits/gtk-sharp20/Makefile
index 6c182e304a4e..fe273d23b0a5 100644
--- a/x11-toolkits/gtk-sharp20/Makefile
+++ b/x11-toolkits/gtk-sharp20/Makefile
@@ -1,38 +1,32 @@
 PORTNAME=	gtk-sharp
 PORTVERSION=	2.12.45
 PORTREVISION=	4
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://download.mono-project.com/sources/gtk-sharp212/
 PKGNAMESUFFIX=	20
 
 MAINTAINER=	mono@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}
 
-.include <bsd.port.pre.mk>
-
-.if defined(MONO_DEFAULT) && ${MONO_DEFAULT} > 6
-BROKEN=		fails to build with Mono version ${MONO_DEFAULT}: 'Range' is an ambiguous reference between 'System.Range' and 'Gtk.Range'
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \
 		${WRKSRC}/glib/glue/*.c
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/gtk-sharp20/files/patch-sample_test_TestRange.cs b/x11-toolkits/gtk-sharp20/files/patch-sample_test_TestRange.cs
new file mode 100644
index 000000000000..ac009e65f700
--- /dev/null
+++ b/x11-toolkits/gtk-sharp20/files/patch-sample_test_TestRange.cs
@@ -0,0 +1,28 @@
+--- sample/test/TestRange.cs.orig	2016-09-21 11:49:20 UTC
++++ sample/test/TestRange.cs
+@@ -32,14 +32,14 @@ namespace WidgetViewer {
+ 
+ 			HScale hscale = new HScale (adjustment);
+ 			hscale.SetSizeRequest (150, -1);
+-			((Range) hscale).UpdatePolicy = UpdateType.Delayed;
++			((Gtk.Range) hscale).UpdatePolicy = UpdateType.Delayed;
+ 
+ 			hscale.Digits = 1;
+ 			hscale.DrawValue = true;
+ 			box2.PackStart (hscale, true, true, 0);
+ 
+ 			HScrollbar hscrollbar = new HScrollbar (adjustment);
+-			((Range) hscrollbar).UpdatePolicy = UpdateType.Continuous;
++			((Gtk.Range) hscrollbar).UpdatePolicy = UpdateType.Continuous;
+ 			box2.PackStart (hscrollbar, true, true, 0);
+ 
+ 			hscale = new HScale (adjustment);
+@@ -59,7 +59,7 @@ namespace WidgetViewer {
+ 			vscale.SetSizeRequest (-1, 200);
+ 			vscale.Digits = 2;
+ 			vscale.DrawValue = true;
+-			((Range) vscale).Inverted = true;
++			((Gtk.Range) vscale).Inverted = true;
+ 			hbox.PackStart (vscale, true, true, 0);
+ 
+ 			vscale = new VScale (adjustment);
diff --git a/x11-toolkits/gtk-sharp30/Makefile b/x11-toolkits/gtk-sharp30/Makefile
index 87f04bbe7fad..7c7a2d72342d 100644
--- a/x11-toolkits/gtk-sharp30/Makefile
+++ b/x11-toolkits/gtk-sharp30/Makefile
@@ -1,37 +1,31 @@
 PORTNAME=	gtk-sharp
 PORTVERSION=	2.99.3
 PORTREVISION=	4
 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}
 
-.include <bsd.port.pre.mk>
-
-.if defined(MONO_DEFAULT) && ${MONO_DEFAULT} > 6
-BROKEN=		fails to build with Mono version ${MONO_DEFAULT}: 'Range' is an ambiguous reference between 'System.Range' and 'Gtk.Range'
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|gmcs|mcs|g' \
 		${WRKSRC}/configure
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/gtk-sharp30/files/patch-sample_test_TestRange.cs b/x11-toolkits/gtk-sharp30/files/patch-sample_test_TestRange.cs
new file mode 100644
index 000000000000..ef5a1e2aff1a
--- /dev/null
+++ b/x11-toolkits/gtk-sharp30/files/patch-sample_test_TestRange.cs
@@ -0,0 +1,11 @@
+--- sample/test/TestRange.cs.orig	2013-08-18 15:32:57 UTC
++++ sample/test/TestRange.cs
+@@ -57,7 +57,7 @@ namespace WidgetViewer {
+ 			vscale.SetSizeRequest (-1, 200);
+ 			vscale.Digits = 2;
+ 			vscale.DrawValue = true;
+-			((Range) vscale).Inverted = true;
++			((Gtk.Range) vscale).Inverted = true;
+ 			hbox.PackStart (vscale, true, true, 0);
+ 
+ 			vscale = new VScale (adjustment);