diff --git a/audio/muine/Makefile b/audio/muine/Makefile
index ad04aea2680c..e250fbf398dc 100644
--- a/audio/muine/Makefile
+++ b/audio/muine/Makefile
@@ -18,9 +18,9 @@ LIB_DEPENDS=	FLAC.7:${PORTSDIR}/audio/flac \
 		id3tag.2:${PORTSDIR}/audio/libid3tag \
 		gdbm:${PORTSDIR}/databases/gdbm \
 		vorbis.3:${PORTSDIR}/audio/libvorbis
-BUILD_DEPENDS=	gapi2-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp-devel \
+BUILD_DEPENDS=	gapi2-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp20 \
 		${LOCALBASE}/lib/mono/dbus-sharp/dbus-sharp.dll:${PORTSDIR}/devel/dbus-sharp
-RUN_DEPENDS=	gapi2-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp-devel \
+RUN_DEPENDS=	gapi2-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp20 \
 		${LOCALBASE}/lib/mono/dbus-sharp/dbus-sharp.dll:${PORTSDIR}/devel/dbus-sharp
 
 USE_GMAKE=	yes
diff --git a/comms/gfax/Makefile b/comms/gfax/Makefile
index 5a8617f4c2ff..936437f3956a 100644
--- a/comms/gfax/Makefile
+++ b/comms/gfax/Makefile
@@ -16,9 +16,9 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-1
 MAINTAINER=	bsd-sharp-list@forge.novell.com
 COMMENT=	A Mono based pop-up fax manager
 
-BUILD_DEPENDS=	${X11BASE}/lib/mono/gtk-sharp/gtk-sharp.dll:${PORTSDIR}/x11-toolkits/gtk-sharp \
+BUILD_DEPENDS=	${X11BASE}/lib/mono/gtk-sharp/gtk-sharp.dll:${PORTSDIR}/x11-toolkits/gtk-sharp10 \
 		bash:${PORTSDIR}/shells/bash2
-RUN_DEPENDS=	${X11BASE}/lib/mono/gtk-sharp/gtk-sharp.dll:${PORTSDIR}/x11-toolkits/gtk-sharp \
+RUN_DEPENDS=	${X11BASE}/lib/mono/gtk-sharp/gtk-sharp.dll:${PORTSDIR}/x11-toolkits/gtk-sharp10 \
 		${LOCALBASE}/bin/sendfax:${PORTSDIR}/comms/hylafax \
 		bash:${PORTSDIR}/shells/bash2
 
diff --git a/deskutils/mcatalog/Makefile b/deskutils/mcatalog/Makefile
index ffdc6f7358f1..75845a41141b 100644
--- a/deskutils/mcatalog/Makefile
+++ b/deskutils/mcatalog/Makefile
@@ -15,9 +15,9 @@ MASTER_SITE_SUBDIR=	mcatalog
 MAINTAINER=	bsd-sharp-list@forge.novell.com
 COMMENT=	An application for catalogue films and books
 
-BUILD_DEPENDS=	gapi-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp
+BUILD_DEPENDS=	gapi-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp10
 LIB_DEPENDS=	sqlite.2:${PORTSDIR}/databases/sqlite2
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	gapi-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp10
 
 USE_GNOME=	gnomeprefix gnomehack gconf2
 USE_GMAKE=	yes
diff --git a/deskutils/tomboy/Makefile b/deskutils/tomboy/Makefile
index dc67e117558e..6736cd753c4b 100644
--- a/deskutils/tomboy/Makefile
+++ b/deskutils/tomboy/Makefile
@@ -16,9 +16,9 @@ MAINTAINER=	bsd-sharp-list@forge.novell.com
 COMMENT=	Personal note taking system for the GNOME desktop
 
 LIB_DEPENDS=	gtkspell.0:${PORTSDIR}/textproc/gtkspell2
-BUILD_DEPENDS=	gapi-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp \
+BUILD_DEPENDS=	gapi-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp10 \
 		${LOCALBASE}/lib/mono/dbus-sharp/dbus-sharp.dll:${PORTSDIR}/devel/dbus-sharp
-RUN_DEPENDS=	gapi-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp \
+RUN_DEPENDS=	gapi-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp10 \
 		${LOCALBASE}/lib/mono/dbus-sharp/dbus-sharp.dll:${PORTSDIR}/devel/dbus-sharp
 
 USE_GNOME=	gnomehack gnometarget intltool gnomeprefix gnomepanel
diff --git a/devel/mono-tools/Makefile b/devel/mono-tools/Makefile
index 60a667dc21fd..996401e6228d 100644
--- a/devel/mono-tools/Makefile
+++ b/devel/mono-tools/Makefile
@@ -15,9 +15,9 @@ MASTER_SITES=	http://www.go-mono.com/sources/${PORTNAME}/
 MAINTAINER=	bsd-sharp-list@forge.novell.com
 COMMENT=	Documentation browser for Mono and Mono libraries
 
-BUILD_DEPENDS=	gapi-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp \
+BUILD_DEPENDS=	gapi-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp10 \
 		monodocer:${PORTSDIR}/devel/monodoc
-RUN_DEPENDS=	gapi-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp \
+RUN_DEPENDS=	gapi-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp10 \
 		monodocer:${PORTSDIR}/devel/monodoc
 
 USE_GNOME=	gnomehack gnometarget
diff --git a/editors/bless/Makefile b/editors/bless/Makefile
index fd547553fbbb..0ac2d5f09ee7 100644
--- a/editors/bless/Makefile
+++ b/editors/bless/Makefile
@@ -15,8 +15,8 @@ MASTER_SITES=	http://download.gna.org/bless/
 MAINTAINER=	bsd-sharp-list@forge.novell.com
 COMMENT=	A high quality, full featured hex editor
 
-BUILD_DEPENDS=	gapi-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	gapi-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp10
+RUN_DEPENDS=	gapi-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp10
 
 USE_GNOME=	gnomehack gnomeprefix gnometarget
 USE_GMAKE=	yes
diff --git a/graphics/f-spot/Makefile b/graphics/f-spot/Makefile
index 0d60bda71be8..63526d2fe5a6 100644
--- a/graphics/f-spot/Makefile
+++ b/graphics/f-spot/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS=	lcms.1:${PORTSDIR}/graphics/lcms \
 		exif.12:${PORTSDIR}/graphics/libexif \
 		sqlite.2:${PORTSDIR}/databases/sqlite2 \
 		gphoto2.2:${PORTSDIR}/graphics/libgphoto2
-BUILD_DEPENDS=	gapi-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	gapi-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp10
+RUN_DEPENDS=	gapi-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp10
 
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnomeprefix gnometarget intlhack
diff --git a/net/blam/Makefile b/net/blam/Makefile
index 4f968a82977d..dbbd0a472496 100644
--- a/net/blam/Makefile
+++ b/net/blam/Makefile
@@ -15,9 +15,9 @@ MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.8
 MAINTAINER=	bsd-sharp-list@forge.novell.com
 COMMENT=	Mono based RSS feed reader
 
-BUILD_DEPENDS=	gapi-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp \
+BUILD_DEPENDS=	gapi-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp10 \
 		${X11BASE}/libdata/pkgconfig/gecko-sharp.pc:${PORTSDIR}/www/gecko-sharp10
-RUN_DEPENDS=	gapi-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp \
+RUN_DEPENDS=	gapi-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp10 \
 		${X11BASE}/libdata/pkgconfig/gecko-sharp.pc:${PORTSDIR}/www/gecko-sharp10
 
 .if !defined(WITH_MOZILLA)
diff --git a/www/gecko-sharp10/Makefile b/www/gecko-sharp10/Makefile
index bbf92383ac7d..12ded4c2a0b4 100644
--- a/www/gecko-sharp10/Makefile
+++ b/www/gecko-sharp10/Makefile
@@ -14,8 +14,8 @@ MASTER_SITES=	http://go-mono.com/archive/1.0.3/
 MAINTAINER=	bsd-sharp-list@forge.novell.com
 COMMENT=	Mono bindings for embeding mozilla
 
-BUILD_DEPENDS=	gapi-parser:${PORTSDIR}/x11-toolkits/gtk-sharp
-RUN_DEPENDS=	${BUILD_DEPENDS} \
+BUILD_DEPENDS=	gapi-parser:${PORTSDIR}/x11-toolkits/gtk-sharp10
+RUN_DEPENDS=	gapi-parser:${PORTSDIR}/x11-toolkits/gtk-sharp10 \
 		${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
 
 .if !defined(WITH_MOZILLA)
diff --git a/www/gecko-sharp20/Makefile b/www/gecko-sharp20/Makefile
index b87ca15f7aa9..7a53e882af3c 100644
--- a/www/gecko-sharp20/Makefile
+++ b/www/gecko-sharp20/Makefile
@@ -16,9 +16,9 @@ DISTNAME=	gecko-sharp-2.0-${PORTVERSION}
 MAINTAINER=	bsd-sharp-list@forge.novell.com
 COMMENT=	Mono bindings for embeding mozilla
 
-BUILD_DEPENDS=	gapi2-parser:${PORTSDIR}/x11-toolkits/gtk-sharp-devel \
+BUILD_DEPENDS=	gapi2-parser:${PORTSDIR}/x11-toolkits/gtk-sharp20 \
 		monodoc:${PORTSDIR}/devel/mono-tools
-RUN_DEPENDS=	gapi2-parser:${PORTSDIR}/x11-toolkits/gtk-sharp-devel \
+RUN_DEPENDS=	gapi2-parser:${PORTSDIR}/x11-toolkits/gtk-sharp20 \
 		monodoc:${PORTSDIR}/devel/mono-tools \
 		${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}