diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index b7263bc2c6f9..d5258ade9926 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mono
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://mono.ximian.com/archive/${PORTVERSION}/
 
diff --git a/lang/mono/files/patch-configure b/lang/mono/files/patch-configure
index 5cc371af7064..529b42aa2141 100644
--- a/lang/mono/files/patch-configure
+++ b/lang/mono/files/patch-configure
@@ -22,7 +22,7 @@
 -LIBC="libc.so.6"
 -INTL="libc.so.6"
 +LIBC="libc.so"
-+INTL="libc.so"
++INTL="libintl.so"
  
  jit_wanted=false
  case "$host" in
diff --git a/x11-toolkits/gtk-sharp-devel/Makefile b/x11-toolkits/gtk-sharp-devel/Makefile
index 3984c6a235a4..9965943e53a2 100644
--- a/x11-toolkits/gtk-sharp-devel/Makefile
+++ b/x11-toolkits/gtk-sharp-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk-sharp
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://mono.ximian.com/archive/${PORTVERSION}/
 
diff --git a/x11-toolkits/gtk-sharp-devel/files/patch-art_art-sharp.dll.config.in b/x11-toolkits/gtk-sharp-devel/files/patch-art_art-sharp.dll.config.in
index 24e14fcd5c67..1e97f4b51166 100644
--- a/x11-toolkits/gtk-sharp-devel/files/patch-art_art-sharp.dll.config.in
+++ b/x11-toolkits/gtk-sharp-devel/files/patch-art_art-sharp.dll.config.in
@@ -3,5 +3,5 @@
 @@ -1,3 +1,3 @@
  <configuration>
 -  <dllmap dll="art_lgpl" target="libart_lgpl_2@LIB_PREFIX@.2@LIB_SUFFIX@"/>
-+  <dllmap dll="art_lgpl" target="libart_lgpl@LIB_PREFIX@.5@LIB_SUFFIX@"/>
++  <dllmap dll="art_lgpl" target="libart_lgpl@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
diff --git a/x11-toolkits/gtk-sharp-devel/files/patch-atk_atk-sharp.dll.config.in b/x11-toolkits/gtk-sharp-devel/files/patch-atk_atk-sharp.dll.config.in
index 2df24a33c504..20fa8d481623 100644
--- a/x11-toolkits/gtk-sharp-devel/files/patch-atk_atk-sharp.dll.config.in
+++ b/x11-toolkits/gtk-sharp-devel/files/patch-atk_atk-sharp.dll.config.in
@@ -3,5 +3,5 @@
 @@ -1,3 +1,3 @@
  <configuration>
 -  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-+  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.600@LIB_SUFFIX@"/>
++  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
diff --git a/x11-toolkits/gtk-sharp-devel/files/patch-gconf_GConf_gconf-sharp.dll.config.in b/x11-toolkits/gtk-sharp-devel/files/patch-gconf_GConf_gconf-sharp.dll.config.in
index c413aac86d3b..fbf4fe877fc0 100644
--- a/x11-toolkits/gtk-sharp-devel/files/patch-gconf_GConf_gconf-sharp.dll.config.in
+++ b/x11-toolkits/gtk-sharp-devel/files/patch-gconf_GConf_gconf-sharp.dll.config.in
@@ -3,5 +3,5 @@
 @@ -1,3 +1,3 @@
  <configuration>
 -  <dllmap dll="gconf-2" target="libgconf-2@LIB_PREFIX@.4@LIB_SUFFIX@"/>
-+  <dllmap dll="gconf-2" target="libgconf-2@LIB_PREFIX@.5@LIB_SUFFIX@"/>
++  <dllmap dll="gconf-2" target="libgconf-2@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
diff --git a/x11-toolkits/gtk-sharp-devel/files/patch-gda_gda-sharp.dll.config.in b/x11-toolkits/gtk-sharp-devel/files/patch-gda_gda-sharp.dll.config.in
index efdd1407043f..dd496cd4542a 100644
--- a/x11-toolkits/gtk-sharp-devel/files/patch-gda_gda-sharp.dll.config.in
+++ b/x11-toolkits/gtk-sharp-devel/files/patch-gda_gda-sharp.dll.config.in
@@ -3,5 +3,5 @@
 @@ -1,3 +1,3 @@
  <configuration>
 -  <dllmap dll="gda-2" target="libgda-2@LIB_PREFIX@.1@LIB_SUFFIX@"/>
-+  <dllmap dll="gda-2" target="libgda-2@LIB_PREFIX@.2@LIB_SUFFIX@"/>
++  <dllmap dll="gda-2" target="libgda-2@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
diff --git a/x11-toolkits/gtk-sharp-devel/files/patch-gdk_gdk-sharp.dll.config.in b/x11-toolkits/gtk-sharp-devel/files/patch-gdk_gdk-sharp.dll.config.in
index 375dee3deb42..1473fcec44eb 100644
--- a/x11-toolkits/gtk-sharp-devel/files/patch-gdk_gdk-sharp.dll.config.in
+++ b/x11-toolkits/gtk-sharp-devel/files/patch-gdk_gdk-sharp.dll.config.in
@@ -6,8 +6,8 @@
 -  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 -  <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-x11-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 -  <dllmap dll="libgdk_pixbuf-2.0-0.dll" target="libgdk_pixbuf-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-+  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-x11-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libgdk_pixbuf-2.0-0.dll" target="libgdk_pixbuf-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
++  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-x11-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgdk_pixbuf-2.0-0.dll" target="libgdk_pixbuf-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
diff --git a/x11-toolkits/gtk-sharp-devel/files/patch-glade_glade-sharp.dll.config.in b/x11-toolkits/gtk-sharp-devel/files/patch-glade_glade-sharp.dll.config.in
new file mode 100644
index 000000000000..933e9dcb44a1
--- /dev/null
+++ b/x11-toolkits/gtk-sharp-devel/files/patch-glade_glade-sharp.dll.config.in
@@ -0,0 +1,7 @@
+--- glade/glade-sharp.dll.config.in.orig	Tue Jun 22 11:19:01 2004
++++ glade/glade-sharp.dll.config.in	Thu Aug 12 22:37:17 2004
+@@ -1,3 +1,3 @@
+ <configuration>
+-  <dllmap dll="libglade-2.0-0.dll" target="libglade-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
++  <dllmap dll="libglade-2.0-0.dll" target="libglade-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
+ </configuration>
diff --git a/x11-toolkits/gtk-sharp-devel/files/patch-glib_glib-sharp.dll.config.in b/x11-toolkits/gtk-sharp-devel/files/patch-glib_glib-sharp.dll.config.in
index f06de381f616..9416fd2480b5 100644
--- a/x11-toolkits/gtk-sharp-devel/files/patch-glib_glib-sharp.dll.config.in
+++ b/x11-toolkits/gtk-sharp-devel/files/patch-glib_glib-sharp.dll.config.in
@@ -5,7 +5,7 @@
 -  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 -  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 -  <dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-+  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
++  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
diff --git a/x11-toolkits/gtk-sharp-devel/files/patch-gnome_gnome-sharp.dll.config.in b/x11-toolkits/gtk-sharp-devel/files/patch-gnome_gnome-sharp.dll.config.in
index ee203c674abb..29e5230ba028 100644
--- a/x11-toolkits/gtk-sharp-devel/files/patch-gnome_gnome-sharp.dll.config.in
+++ b/x11-toolkits/gtk-sharp-devel/files/patch-gnome_gnome-sharp.dll.config.in
@@ -11,13 +11,13 @@
 -  <dllmap dll="gnomeprint-2-2" target="libgnomeprint-2-2@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 -  <dllmap dll="gnomeprintui-2-2" target="libgnomeprintui-2-2@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 -  <dllmap dll="gnomeui-2" target="libgnomeui-2@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-+  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="gnome-2" target="libgnome-2@LIB_PREFIX@.600@LIB_SUFFIX@"/>
-+  <dllmap dll="gnomecanvas-2" target="libgnomecanvas-2@LIB_PREFIX@.600@LIB_SUFFIX@"/>
-+  <dllmap dll="gnomeprint-2-2" target="libgnomeprint-2-2@LIB_PREFIX@.1@LIB_SUFFIX@"/>
-+  <dllmap dll="gnomeprintui-2-2" target="libgnomeprintui-2-2@LIB_PREFIX@.1@LIB_SUFFIX@"/>
-+  <dllmap dll="gnomeui-2" target="libgnomeui-2@LIB_PREFIX@.600@LIB_SUFFIX@"/>
++  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="gnome-2" target="libgnome-2@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="gnomecanvas-2" target="libgnomecanvas-2@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="gnomeprint-2-2" target="libgnomeprint-2-2@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="gnomeprintui-2-2" target="libgnomeprintui-2-2@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="gnomeui-2" target="libgnomeui-2@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
diff --git a/x11-toolkits/gtk-sharp-devel/files/patch-gnomedb_gnomedb-sharp.dll.config.in b/x11-toolkits/gtk-sharp-devel/files/patch-gnomedb_gnomedb-sharp.dll.config.in
new file mode 100644
index 000000000000..9a420cea3d69
--- /dev/null
+++ b/x11-toolkits/gtk-sharp-devel/files/patch-gnomedb_gnomedb-sharp.dll.config.in
@@ -0,0 +1,7 @@
+--- gnomedb/gnomedb-sharp.dll.config.in.orig	Tue Jun 22 11:19:01 2004
++++ gnomedb/gnomedb-sharp.dll.config.in	Thu Aug 12 22:39:24 2004
+@@ -1,3 +1,3 @@
+ <configuration>
+-  <dllmap dll="gnomedb-2" target="libgnomedb-2@LIB_PREFIX@.3@LIB_SUFFIX@"/>
++  <dllmap dll="gnomedb-2" target="libgnomedb-2@LIB_PREFIX@@LIB_SUFFIX@"/>
+ </configuration>
diff --git a/x11-toolkits/gtk-sharp-devel/files/patch-gtk_gtk-sharp.dll.config.in b/x11-toolkits/gtk-sharp-devel/files/patch-gtk_gtk-sharp.dll.config.in
index 968145c75d92..5954c89fa771 100644
--- a/x11-toolkits/gtk-sharp-devel/files/patch-gtk_gtk-sharp.dll.config.in
+++ b/x11-toolkits/gtk-sharp-devel/files/patch-gtk_gtk-sharp.dll.config.in
@@ -6,8 +6,8 @@
 -  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 -  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 -  <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-+  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.600@LIB_SUFFIX@"/>
-+  <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
++  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
diff --git a/x11-toolkits/gtk-sharp-devel/files/patch-gtkhtml_gtkhtml-sharp.dll.config.in b/x11-toolkits/gtk-sharp-devel/files/patch-gtkhtml_gtkhtml-sharp.dll.config.in
new file mode 100644
index 000000000000..7109eb4c853d
--- /dev/null
+++ b/x11-toolkits/gtk-sharp-devel/files/patch-gtkhtml_gtkhtml-sharp.dll.config.in
@@ -0,0 +1,7 @@
+--- gtkhtml/gtkhtml-sharp.dll.config.in.orig	Tue Jun 22 11:19:02 2004
++++ gtkhtml/gtkhtml-sharp.dll.config.in	Thu Aug 12 22:43:21 2004
+@@ -1,3 +1,3 @@
+ <configuration>
+-  <dllmap dll="gtkhtml-3.0" target="libgtkhtml-@GTKHTML_VERSION@@LIB_PREFIX@.@GTKHTML_SOVERSION@@LIB_SUFFIX@"/>
++  <dllmap dll="gtkhtml-3.0" target="libgtkhtml-@GTKHTML_VERSION@@LIB_PREFIX@@LIB_SUFFIX@"/>
+ </configuration>
diff --git a/x11-toolkits/gtk-sharp-devel/files/patch-pango_pango-sharp.dll.config.in b/x11-toolkits/gtk-sharp-devel/files/patch-pango_pango-sharp.dll.config.in
index 172b32ea9711..58b403b8255a 100644
--- a/x11-toolkits/gtk-sharp-devel/files/patch-pango_pango-sharp.dll.config.in
+++ b/x11-toolkits/gtk-sharp-devel/files/patch-pango_pango-sharp.dll.config.in
@@ -3,5 +3,5 @@
 @@ -1,3 +1,3 @@
  <configuration>
 -  <dllmap dll="libpango-1.0-0.dll" target="libpango-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-+  <dllmap dll="libpango-1.0-0.dll" target="libpango-1.0@LIB_PREFIX@.399@LIB_SUFFIX@"/>
++  <dllmap dll="libpango-1.0-0.dll" target="libpango-1.0@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
diff --git a/x11-toolkits/gtk-sharp-devel/files/patch-rsvg_rsvg-sharp.dll.config.in b/x11-toolkits/gtk-sharp-devel/files/patch-rsvg_rsvg-sharp.dll.config.in
index d842eea02368..1cc50160b1fe 100644
--- a/x11-toolkits/gtk-sharp-devel/files/patch-rsvg_rsvg-sharp.dll.config.in
+++ b/x11-toolkits/gtk-sharp-devel/files/patch-rsvg_rsvg-sharp.dll.config.in
@@ -3,5 +3,5 @@
 @@ -1,3 +1,3 @@
  <configuration>
 -  <dllmap dll="rsvg-2" target="librsvg-2@LIB_PREFIX@.2@LIB_SUFFIX@"/>
-+  <dllmap dll="rsvg-2" target="librsvg-2@LIB_PREFIX@.8@LIB_SUFFIX@"/>
++  <dllmap dll="rsvg-2" target="librsvg-2@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
diff --git a/x11-toolkits/gtk-sharp-devel/files/patch-vte_vte-sharp.dll.config.in b/x11-toolkits/gtk-sharp-devel/files/patch-vte_vte-sharp.dll.config.in
index 8eea6a77b670..66cf7a773e4c 100644
--- a/x11-toolkits/gtk-sharp-devel/files/patch-vte_vte-sharp.dll.config.in
+++ b/x11-toolkits/gtk-sharp-devel/files/patch-vte_vte-sharp.dll.config.in
@@ -4,6 +4,6 @@
  <configuration>
 -  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 -  <dllmap dll="vte" target="libvte@LIB_PREFIX@.4@LIB_SUFFIX@"/>
-+  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.600@LIB_SUFFIX@"/>
-+  <dllmap dll="vte" target="libvte@LIB_PREFIX@.8@LIB_SUFFIX@"/>
++  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="vte" target="libvte@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
diff --git a/x11-toolkits/gtk-sharp/Makefile b/x11-toolkits/gtk-sharp/Makefile
index 3984c6a235a4..9965943e53a2 100644
--- a/x11-toolkits/gtk-sharp/Makefile
+++ b/x11-toolkits/gtk-sharp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk-sharp
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://mono.ximian.com/archive/${PORTVERSION}/
 
diff --git a/x11-toolkits/gtk-sharp/files/patch-art_art-sharp.dll.config.in b/x11-toolkits/gtk-sharp/files/patch-art_art-sharp.dll.config.in
index 24e14fcd5c67..1e97f4b51166 100644
--- a/x11-toolkits/gtk-sharp/files/patch-art_art-sharp.dll.config.in
+++ b/x11-toolkits/gtk-sharp/files/patch-art_art-sharp.dll.config.in
@@ -3,5 +3,5 @@
 @@ -1,3 +1,3 @@
  <configuration>
 -  <dllmap dll="art_lgpl" target="libart_lgpl_2@LIB_PREFIX@.2@LIB_SUFFIX@"/>
-+  <dllmap dll="art_lgpl" target="libart_lgpl@LIB_PREFIX@.5@LIB_SUFFIX@"/>
++  <dllmap dll="art_lgpl" target="libart_lgpl@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
diff --git a/x11-toolkits/gtk-sharp/files/patch-atk_atk-sharp.dll.config.in b/x11-toolkits/gtk-sharp/files/patch-atk_atk-sharp.dll.config.in
index 2df24a33c504..20fa8d481623 100644
--- a/x11-toolkits/gtk-sharp/files/patch-atk_atk-sharp.dll.config.in
+++ b/x11-toolkits/gtk-sharp/files/patch-atk_atk-sharp.dll.config.in
@@ -3,5 +3,5 @@
 @@ -1,3 +1,3 @@
  <configuration>
 -  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-+  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.600@LIB_SUFFIX@"/>
++  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
diff --git a/x11-toolkits/gtk-sharp/files/patch-gconf_GConf_gconf-sharp.dll.config.in b/x11-toolkits/gtk-sharp/files/patch-gconf_GConf_gconf-sharp.dll.config.in
index c413aac86d3b..fbf4fe877fc0 100644
--- a/x11-toolkits/gtk-sharp/files/patch-gconf_GConf_gconf-sharp.dll.config.in
+++ b/x11-toolkits/gtk-sharp/files/patch-gconf_GConf_gconf-sharp.dll.config.in
@@ -3,5 +3,5 @@
 @@ -1,3 +1,3 @@
  <configuration>
 -  <dllmap dll="gconf-2" target="libgconf-2@LIB_PREFIX@.4@LIB_SUFFIX@"/>
-+  <dllmap dll="gconf-2" target="libgconf-2@LIB_PREFIX@.5@LIB_SUFFIX@"/>
++  <dllmap dll="gconf-2" target="libgconf-2@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
diff --git a/x11-toolkits/gtk-sharp/files/patch-gda_gda-sharp.dll.config.in b/x11-toolkits/gtk-sharp/files/patch-gda_gda-sharp.dll.config.in
index efdd1407043f..dd496cd4542a 100644
--- a/x11-toolkits/gtk-sharp/files/patch-gda_gda-sharp.dll.config.in
+++ b/x11-toolkits/gtk-sharp/files/patch-gda_gda-sharp.dll.config.in
@@ -3,5 +3,5 @@
 @@ -1,3 +1,3 @@
  <configuration>
 -  <dllmap dll="gda-2" target="libgda-2@LIB_PREFIX@.1@LIB_SUFFIX@"/>
-+  <dllmap dll="gda-2" target="libgda-2@LIB_PREFIX@.2@LIB_SUFFIX@"/>
++  <dllmap dll="gda-2" target="libgda-2@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
diff --git a/x11-toolkits/gtk-sharp/files/patch-gdk_gdk-sharp.dll.config.in b/x11-toolkits/gtk-sharp/files/patch-gdk_gdk-sharp.dll.config.in
index 375dee3deb42..1473fcec44eb 100644
--- a/x11-toolkits/gtk-sharp/files/patch-gdk_gdk-sharp.dll.config.in
+++ b/x11-toolkits/gtk-sharp/files/patch-gdk_gdk-sharp.dll.config.in
@@ -6,8 +6,8 @@
 -  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 -  <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-x11-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 -  <dllmap dll="libgdk_pixbuf-2.0-0.dll" target="libgdk_pixbuf-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-+  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-x11-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libgdk_pixbuf-2.0-0.dll" target="libgdk_pixbuf-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
++  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-x11-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgdk_pixbuf-2.0-0.dll" target="libgdk_pixbuf-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
diff --git a/x11-toolkits/gtk-sharp/files/patch-glade_glade-sharp.dll.config.in b/x11-toolkits/gtk-sharp/files/patch-glade_glade-sharp.dll.config.in
new file mode 100644
index 000000000000..933e9dcb44a1
--- /dev/null
+++ b/x11-toolkits/gtk-sharp/files/patch-glade_glade-sharp.dll.config.in
@@ -0,0 +1,7 @@
+--- glade/glade-sharp.dll.config.in.orig	Tue Jun 22 11:19:01 2004
++++ glade/glade-sharp.dll.config.in	Thu Aug 12 22:37:17 2004
+@@ -1,3 +1,3 @@
+ <configuration>
+-  <dllmap dll="libglade-2.0-0.dll" target="libglade-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
++  <dllmap dll="libglade-2.0-0.dll" target="libglade-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
+ </configuration>
diff --git a/x11-toolkits/gtk-sharp/files/patch-glib_glib-sharp.dll.config.in b/x11-toolkits/gtk-sharp/files/patch-glib_glib-sharp.dll.config.in
index f06de381f616..9416fd2480b5 100644
--- a/x11-toolkits/gtk-sharp/files/patch-glib_glib-sharp.dll.config.in
+++ b/x11-toolkits/gtk-sharp/files/patch-glib_glib-sharp.dll.config.in
@@ -5,7 +5,7 @@
 -  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 -  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 -  <dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-+  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
++  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
diff --git a/x11-toolkits/gtk-sharp/files/patch-gnome_gnome-sharp.dll.config.in b/x11-toolkits/gtk-sharp/files/patch-gnome_gnome-sharp.dll.config.in
index ee203c674abb..29e5230ba028 100644
--- a/x11-toolkits/gtk-sharp/files/patch-gnome_gnome-sharp.dll.config.in
+++ b/x11-toolkits/gtk-sharp/files/patch-gnome_gnome-sharp.dll.config.in
@@ -11,13 +11,13 @@
 -  <dllmap dll="gnomeprint-2-2" target="libgnomeprint-2-2@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 -  <dllmap dll="gnomeprintui-2-2" target="libgnomeprintui-2-2@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 -  <dllmap dll="gnomeui-2" target="libgnomeui-2@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-+  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="gnome-2" target="libgnome-2@LIB_PREFIX@.600@LIB_SUFFIX@"/>
-+  <dllmap dll="gnomecanvas-2" target="libgnomecanvas-2@LIB_PREFIX@.600@LIB_SUFFIX@"/>
-+  <dllmap dll="gnomeprint-2-2" target="libgnomeprint-2-2@LIB_PREFIX@.1@LIB_SUFFIX@"/>
-+  <dllmap dll="gnomeprintui-2-2" target="libgnomeprintui-2-2@LIB_PREFIX@.1@LIB_SUFFIX@"/>
-+  <dllmap dll="gnomeui-2" target="libgnomeui-2@LIB_PREFIX@.600@LIB_SUFFIX@"/>
++  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="gnome-2" target="libgnome-2@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="gnomecanvas-2" target="libgnomecanvas-2@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="gnomeprint-2-2" target="libgnomeprint-2-2@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="gnomeprintui-2-2" target="libgnomeprintui-2-2@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="gnomeui-2" target="libgnomeui-2@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
diff --git a/x11-toolkits/gtk-sharp/files/patch-gnomedb_gnomedb-sharp.dll.config.in b/x11-toolkits/gtk-sharp/files/patch-gnomedb_gnomedb-sharp.dll.config.in
new file mode 100644
index 000000000000..9a420cea3d69
--- /dev/null
+++ b/x11-toolkits/gtk-sharp/files/patch-gnomedb_gnomedb-sharp.dll.config.in
@@ -0,0 +1,7 @@
+--- gnomedb/gnomedb-sharp.dll.config.in.orig	Tue Jun 22 11:19:01 2004
++++ gnomedb/gnomedb-sharp.dll.config.in	Thu Aug 12 22:39:24 2004
+@@ -1,3 +1,3 @@
+ <configuration>
+-  <dllmap dll="gnomedb-2" target="libgnomedb-2@LIB_PREFIX@.3@LIB_SUFFIX@"/>
++  <dllmap dll="gnomedb-2" target="libgnomedb-2@LIB_PREFIX@@LIB_SUFFIX@"/>
+ </configuration>
diff --git a/x11-toolkits/gtk-sharp/files/patch-gtk_gtk-sharp.dll.config.in b/x11-toolkits/gtk-sharp/files/patch-gtk_gtk-sharp.dll.config.in
index 968145c75d92..5954c89fa771 100644
--- a/x11-toolkits/gtk-sharp/files/patch-gtk_gtk-sharp.dll.config.in
+++ b/x11-toolkits/gtk-sharp/files/patch-gtk_gtk-sharp.dll.config.in
@@ -6,8 +6,8 @@
 -  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 -  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 -  <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-+  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.600@LIB_SUFFIX@"/>
-+  <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
++  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
diff --git a/x11-toolkits/gtk-sharp/files/patch-gtkhtml_gtkhtml-sharp.dll.config.in b/x11-toolkits/gtk-sharp/files/patch-gtkhtml_gtkhtml-sharp.dll.config.in
new file mode 100644
index 000000000000..7109eb4c853d
--- /dev/null
+++ b/x11-toolkits/gtk-sharp/files/patch-gtkhtml_gtkhtml-sharp.dll.config.in
@@ -0,0 +1,7 @@
+--- gtkhtml/gtkhtml-sharp.dll.config.in.orig	Tue Jun 22 11:19:02 2004
++++ gtkhtml/gtkhtml-sharp.dll.config.in	Thu Aug 12 22:43:21 2004
+@@ -1,3 +1,3 @@
+ <configuration>
+-  <dllmap dll="gtkhtml-3.0" target="libgtkhtml-@GTKHTML_VERSION@@LIB_PREFIX@.@GTKHTML_SOVERSION@@LIB_SUFFIX@"/>
++  <dllmap dll="gtkhtml-3.0" target="libgtkhtml-@GTKHTML_VERSION@@LIB_PREFIX@@LIB_SUFFIX@"/>
+ </configuration>
diff --git a/x11-toolkits/gtk-sharp/files/patch-pango_pango-sharp.dll.config.in b/x11-toolkits/gtk-sharp/files/patch-pango_pango-sharp.dll.config.in
index 172b32ea9711..58b403b8255a 100644
--- a/x11-toolkits/gtk-sharp/files/patch-pango_pango-sharp.dll.config.in
+++ b/x11-toolkits/gtk-sharp/files/patch-pango_pango-sharp.dll.config.in
@@ -3,5 +3,5 @@
 @@ -1,3 +1,3 @@
  <configuration>
 -  <dllmap dll="libpango-1.0-0.dll" target="libpango-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-+  <dllmap dll="libpango-1.0-0.dll" target="libpango-1.0@LIB_PREFIX@.399@LIB_SUFFIX@"/>
++  <dllmap dll="libpango-1.0-0.dll" target="libpango-1.0@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
diff --git a/x11-toolkits/gtk-sharp/files/patch-rsvg_rsvg-sharp.dll.config.in b/x11-toolkits/gtk-sharp/files/patch-rsvg_rsvg-sharp.dll.config.in
index d842eea02368..1cc50160b1fe 100644
--- a/x11-toolkits/gtk-sharp/files/patch-rsvg_rsvg-sharp.dll.config.in
+++ b/x11-toolkits/gtk-sharp/files/patch-rsvg_rsvg-sharp.dll.config.in
@@ -3,5 +3,5 @@
 @@ -1,3 +1,3 @@
  <configuration>
 -  <dllmap dll="rsvg-2" target="librsvg-2@LIB_PREFIX@.2@LIB_SUFFIX@"/>
-+  <dllmap dll="rsvg-2" target="librsvg-2@LIB_PREFIX@.8@LIB_SUFFIX@"/>
++  <dllmap dll="rsvg-2" target="librsvg-2@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
diff --git a/x11-toolkits/gtk-sharp/files/patch-vte_vte-sharp.dll.config.in b/x11-toolkits/gtk-sharp/files/patch-vte_vte-sharp.dll.config.in
index 8eea6a77b670..66cf7a773e4c 100644
--- a/x11-toolkits/gtk-sharp/files/patch-vte_vte-sharp.dll.config.in
+++ b/x11-toolkits/gtk-sharp/files/patch-vte_vte-sharp.dll.config.in
@@ -4,6 +4,6 @@
  <configuration>
 -  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 -  <dllmap dll="vte" target="libvte@LIB_PREFIX@.4@LIB_SUFFIX@"/>
-+  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.600@LIB_SUFFIX@"/>
-+  <dllmap dll="vte" target="libvte@LIB_PREFIX@.8@LIB_SUFFIX@"/>
++  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="vte" target="libvte@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
diff --git a/x11-toolkits/gtk-sharp10/Makefile b/x11-toolkits/gtk-sharp10/Makefile
index 3984c6a235a4..9965943e53a2 100644
--- a/x11-toolkits/gtk-sharp10/Makefile
+++ b/x11-toolkits/gtk-sharp10/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk-sharp
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://mono.ximian.com/archive/${PORTVERSION}/
 
diff --git a/x11-toolkits/gtk-sharp10/files/patch-art_art-sharp.dll.config.in b/x11-toolkits/gtk-sharp10/files/patch-art_art-sharp.dll.config.in
index 24e14fcd5c67..1e97f4b51166 100644
--- a/x11-toolkits/gtk-sharp10/files/patch-art_art-sharp.dll.config.in
+++ b/x11-toolkits/gtk-sharp10/files/patch-art_art-sharp.dll.config.in
@@ -3,5 +3,5 @@
 @@ -1,3 +1,3 @@
  <configuration>
 -  <dllmap dll="art_lgpl" target="libart_lgpl_2@LIB_PREFIX@.2@LIB_SUFFIX@"/>
-+  <dllmap dll="art_lgpl" target="libart_lgpl@LIB_PREFIX@.5@LIB_SUFFIX@"/>
++  <dllmap dll="art_lgpl" target="libart_lgpl@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
diff --git a/x11-toolkits/gtk-sharp10/files/patch-atk_atk-sharp.dll.config.in b/x11-toolkits/gtk-sharp10/files/patch-atk_atk-sharp.dll.config.in
index 2df24a33c504..20fa8d481623 100644
--- a/x11-toolkits/gtk-sharp10/files/patch-atk_atk-sharp.dll.config.in
+++ b/x11-toolkits/gtk-sharp10/files/patch-atk_atk-sharp.dll.config.in
@@ -3,5 +3,5 @@
 @@ -1,3 +1,3 @@
  <configuration>
 -  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-+  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.600@LIB_SUFFIX@"/>
++  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
diff --git a/x11-toolkits/gtk-sharp10/files/patch-gconf_GConf_gconf-sharp.dll.config.in b/x11-toolkits/gtk-sharp10/files/patch-gconf_GConf_gconf-sharp.dll.config.in
index c413aac86d3b..fbf4fe877fc0 100644
--- a/x11-toolkits/gtk-sharp10/files/patch-gconf_GConf_gconf-sharp.dll.config.in
+++ b/x11-toolkits/gtk-sharp10/files/patch-gconf_GConf_gconf-sharp.dll.config.in
@@ -3,5 +3,5 @@
 @@ -1,3 +1,3 @@
  <configuration>
 -  <dllmap dll="gconf-2" target="libgconf-2@LIB_PREFIX@.4@LIB_SUFFIX@"/>
-+  <dllmap dll="gconf-2" target="libgconf-2@LIB_PREFIX@.5@LIB_SUFFIX@"/>
++  <dllmap dll="gconf-2" target="libgconf-2@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
diff --git a/x11-toolkits/gtk-sharp10/files/patch-gda_gda-sharp.dll.config.in b/x11-toolkits/gtk-sharp10/files/patch-gda_gda-sharp.dll.config.in
index efdd1407043f..dd496cd4542a 100644
--- a/x11-toolkits/gtk-sharp10/files/patch-gda_gda-sharp.dll.config.in
+++ b/x11-toolkits/gtk-sharp10/files/patch-gda_gda-sharp.dll.config.in
@@ -3,5 +3,5 @@
 @@ -1,3 +1,3 @@
  <configuration>
 -  <dllmap dll="gda-2" target="libgda-2@LIB_PREFIX@.1@LIB_SUFFIX@"/>
-+  <dllmap dll="gda-2" target="libgda-2@LIB_PREFIX@.2@LIB_SUFFIX@"/>
++  <dllmap dll="gda-2" target="libgda-2@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
diff --git a/x11-toolkits/gtk-sharp10/files/patch-gdk_gdk-sharp.dll.config.in b/x11-toolkits/gtk-sharp10/files/patch-gdk_gdk-sharp.dll.config.in
index 375dee3deb42..1473fcec44eb 100644
--- a/x11-toolkits/gtk-sharp10/files/patch-gdk_gdk-sharp.dll.config.in
+++ b/x11-toolkits/gtk-sharp10/files/patch-gdk_gdk-sharp.dll.config.in
@@ -6,8 +6,8 @@
 -  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 -  <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-x11-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 -  <dllmap dll="libgdk_pixbuf-2.0-0.dll" target="libgdk_pixbuf-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-+  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-x11-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libgdk_pixbuf-2.0-0.dll" target="libgdk_pixbuf-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
++  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-x11-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgdk_pixbuf-2.0-0.dll" target="libgdk_pixbuf-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
diff --git a/x11-toolkits/gtk-sharp10/files/patch-glade_glade-sharp.dll.config.in b/x11-toolkits/gtk-sharp10/files/patch-glade_glade-sharp.dll.config.in
new file mode 100644
index 000000000000..933e9dcb44a1
--- /dev/null
+++ b/x11-toolkits/gtk-sharp10/files/patch-glade_glade-sharp.dll.config.in
@@ -0,0 +1,7 @@
+--- glade/glade-sharp.dll.config.in.orig	Tue Jun 22 11:19:01 2004
++++ glade/glade-sharp.dll.config.in	Thu Aug 12 22:37:17 2004
+@@ -1,3 +1,3 @@
+ <configuration>
+-  <dllmap dll="libglade-2.0-0.dll" target="libglade-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
++  <dllmap dll="libglade-2.0-0.dll" target="libglade-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
+ </configuration>
diff --git a/x11-toolkits/gtk-sharp10/files/patch-glib_glib-sharp.dll.config.in b/x11-toolkits/gtk-sharp10/files/patch-glib_glib-sharp.dll.config.in
index f06de381f616..9416fd2480b5 100644
--- a/x11-toolkits/gtk-sharp10/files/patch-glib_glib-sharp.dll.config.in
+++ b/x11-toolkits/gtk-sharp10/files/patch-glib_glib-sharp.dll.config.in
@@ -5,7 +5,7 @@
 -  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 -  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 -  <dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-+  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
++  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
diff --git a/x11-toolkits/gtk-sharp10/files/patch-gnome_gnome-sharp.dll.config.in b/x11-toolkits/gtk-sharp10/files/patch-gnome_gnome-sharp.dll.config.in
index ee203c674abb..29e5230ba028 100644
--- a/x11-toolkits/gtk-sharp10/files/patch-gnome_gnome-sharp.dll.config.in
+++ b/x11-toolkits/gtk-sharp10/files/patch-gnome_gnome-sharp.dll.config.in
@@ -11,13 +11,13 @@
 -  <dllmap dll="gnomeprint-2-2" target="libgnomeprint-2-2@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 -  <dllmap dll="gnomeprintui-2-2" target="libgnomeprintui-2-2@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 -  <dllmap dll="gnomeui-2" target="libgnomeui-2@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-+  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="gnome-2" target="libgnome-2@LIB_PREFIX@.600@LIB_SUFFIX@"/>
-+  <dllmap dll="gnomecanvas-2" target="libgnomecanvas-2@LIB_PREFIX@.600@LIB_SUFFIX@"/>
-+  <dllmap dll="gnomeprint-2-2" target="libgnomeprint-2-2@LIB_PREFIX@.1@LIB_SUFFIX@"/>
-+  <dllmap dll="gnomeprintui-2-2" target="libgnomeprintui-2-2@LIB_PREFIX@.1@LIB_SUFFIX@"/>
-+  <dllmap dll="gnomeui-2" target="libgnomeui-2@LIB_PREFIX@.600@LIB_SUFFIX@"/>
++  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="gnome-2" target="libgnome-2@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="gnomecanvas-2" target="libgnomecanvas-2@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="gnomeprint-2-2" target="libgnomeprint-2-2@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="gnomeprintui-2-2" target="libgnomeprintui-2-2@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="gnomeui-2" target="libgnomeui-2@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
diff --git a/x11-toolkits/gtk-sharp10/files/patch-gnomedb_gnomedb-sharp.dll.config.in b/x11-toolkits/gtk-sharp10/files/patch-gnomedb_gnomedb-sharp.dll.config.in
new file mode 100644
index 000000000000..9a420cea3d69
--- /dev/null
+++ b/x11-toolkits/gtk-sharp10/files/patch-gnomedb_gnomedb-sharp.dll.config.in
@@ -0,0 +1,7 @@
+--- gnomedb/gnomedb-sharp.dll.config.in.orig	Tue Jun 22 11:19:01 2004
++++ gnomedb/gnomedb-sharp.dll.config.in	Thu Aug 12 22:39:24 2004
+@@ -1,3 +1,3 @@
+ <configuration>
+-  <dllmap dll="gnomedb-2" target="libgnomedb-2@LIB_PREFIX@.3@LIB_SUFFIX@"/>
++  <dllmap dll="gnomedb-2" target="libgnomedb-2@LIB_PREFIX@@LIB_SUFFIX@"/>
+ </configuration>
diff --git a/x11-toolkits/gtk-sharp10/files/patch-gtk_gtk-sharp.dll.config.in b/x11-toolkits/gtk-sharp10/files/patch-gtk_gtk-sharp.dll.config.in
index 968145c75d92..5954c89fa771 100644
--- a/x11-toolkits/gtk-sharp10/files/patch-gtk_gtk-sharp.dll.config.in
+++ b/x11-toolkits/gtk-sharp10/files/patch-gtk_gtk-sharp.dll.config.in
@@ -6,8 +6,8 @@
 -  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 -  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 -  <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-+  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.600@LIB_SUFFIX@"/>
-+  <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
++  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
diff --git a/x11-toolkits/gtk-sharp10/files/patch-gtkhtml_gtkhtml-sharp.dll.config.in b/x11-toolkits/gtk-sharp10/files/patch-gtkhtml_gtkhtml-sharp.dll.config.in
new file mode 100644
index 000000000000..7109eb4c853d
--- /dev/null
+++ b/x11-toolkits/gtk-sharp10/files/patch-gtkhtml_gtkhtml-sharp.dll.config.in
@@ -0,0 +1,7 @@
+--- gtkhtml/gtkhtml-sharp.dll.config.in.orig	Tue Jun 22 11:19:02 2004
++++ gtkhtml/gtkhtml-sharp.dll.config.in	Thu Aug 12 22:43:21 2004
+@@ -1,3 +1,3 @@
+ <configuration>
+-  <dllmap dll="gtkhtml-3.0" target="libgtkhtml-@GTKHTML_VERSION@@LIB_PREFIX@.@GTKHTML_SOVERSION@@LIB_SUFFIX@"/>
++  <dllmap dll="gtkhtml-3.0" target="libgtkhtml-@GTKHTML_VERSION@@LIB_PREFIX@@LIB_SUFFIX@"/>
+ </configuration>
diff --git a/x11-toolkits/gtk-sharp10/files/patch-pango_pango-sharp.dll.config.in b/x11-toolkits/gtk-sharp10/files/patch-pango_pango-sharp.dll.config.in
index 172b32ea9711..58b403b8255a 100644
--- a/x11-toolkits/gtk-sharp10/files/patch-pango_pango-sharp.dll.config.in
+++ b/x11-toolkits/gtk-sharp10/files/patch-pango_pango-sharp.dll.config.in
@@ -3,5 +3,5 @@
 @@ -1,3 +1,3 @@
  <configuration>
 -  <dllmap dll="libpango-1.0-0.dll" target="libpango-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-+  <dllmap dll="libpango-1.0-0.dll" target="libpango-1.0@LIB_PREFIX@.399@LIB_SUFFIX@"/>
++  <dllmap dll="libpango-1.0-0.dll" target="libpango-1.0@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
diff --git a/x11-toolkits/gtk-sharp10/files/patch-rsvg_rsvg-sharp.dll.config.in b/x11-toolkits/gtk-sharp10/files/patch-rsvg_rsvg-sharp.dll.config.in
index d842eea02368..1cc50160b1fe 100644
--- a/x11-toolkits/gtk-sharp10/files/patch-rsvg_rsvg-sharp.dll.config.in
+++ b/x11-toolkits/gtk-sharp10/files/patch-rsvg_rsvg-sharp.dll.config.in
@@ -3,5 +3,5 @@
 @@ -1,3 +1,3 @@
  <configuration>
 -  <dllmap dll="rsvg-2" target="librsvg-2@LIB_PREFIX@.2@LIB_SUFFIX@"/>
-+  <dllmap dll="rsvg-2" target="librsvg-2@LIB_PREFIX@.8@LIB_SUFFIX@"/>
++  <dllmap dll="rsvg-2" target="librsvg-2@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
diff --git a/x11-toolkits/gtk-sharp10/files/patch-vte_vte-sharp.dll.config.in b/x11-toolkits/gtk-sharp10/files/patch-vte_vte-sharp.dll.config.in
index 8eea6a77b670..66cf7a773e4c 100644
--- a/x11-toolkits/gtk-sharp10/files/patch-vte_vte-sharp.dll.config.in
+++ b/x11-toolkits/gtk-sharp10/files/patch-vte_vte-sharp.dll.config.in
@@ -4,6 +4,6 @@
  <configuration>
 -  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 -  <dllmap dll="vte" target="libvte@LIB_PREFIX@.4@LIB_SUFFIX@"/>
-+  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.600@LIB_SUFFIX@"/>
-+  <dllmap dll="vte" target="libvte@LIB_PREFIX@.8@LIB_SUFFIX@"/>
++  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="vte" target="libvte@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
diff --git a/x11-toolkits/gtk-sharp20/Makefile b/x11-toolkits/gtk-sharp20/Makefile
index 3984c6a235a4..9965943e53a2 100644
--- a/x11-toolkits/gtk-sharp20/Makefile
+++ b/x11-toolkits/gtk-sharp20/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk-sharp
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://mono.ximian.com/archive/${PORTVERSION}/
 
diff --git a/x11-toolkits/gtk-sharp20/files/patch-art_art-sharp.dll.config.in b/x11-toolkits/gtk-sharp20/files/patch-art_art-sharp.dll.config.in
index 24e14fcd5c67..1e97f4b51166 100644
--- a/x11-toolkits/gtk-sharp20/files/patch-art_art-sharp.dll.config.in
+++ b/x11-toolkits/gtk-sharp20/files/patch-art_art-sharp.dll.config.in
@@ -3,5 +3,5 @@
 @@ -1,3 +1,3 @@
  <configuration>
 -  <dllmap dll="art_lgpl" target="libart_lgpl_2@LIB_PREFIX@.2@LIB_SUFFIX@"/>
-+  <dllmap dll="art_lgpl" target="libart_lgpl@LIB_PREFIX@.5@LIB_SUFFIX@"/>
++  <dllmap dll="art_lgpl" target="libart_lgpl@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
diff --git a/x11-toolkits/gtk-sharp20/files/patch-atk_atk-sharp.dll.config.in b/x11-toolkits/gtk-sharp20/files/patch-atk_atk-sharp.dll.config.in
index 2df24a33c504..20fa8d481623 100644
--- a/x11-toolkits/gtk-sharp20/files/patch-atk_atk-sharp.dll.config.in
+++ b/x11-toolkits/gtk-sharp20/files/patch-atk_atk-sharp.dll.config.in
@@ -3,5 +3,5 @@
 @@ -1,3 +1,3 @@
  <configuration>
 -  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-+  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.600@LIB_SUFFIX@"/>
++  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
diff --git a/x11-toolkits/gtk-sharp20/files/patch-gconf_GConf_gconf-sharp.dll.config.in b/x11-toolkits/gtk-sharp20/files/patch-gconf_GConf_gconf-sharp.dll.config.in
index c413aac86d3b..fbf4fe877fc0 100644
--- a/x11-toolkits/gtk-sharp20/files/patch-gconf_GConf_gconf-sharp.dll.config.in
+++ b/x11-toolkits/gtk-sharp20/files/patch-gconf_GConf_gconf-sharp.dll.config.in
@@ -3,5 +3,5 @@
 @@ -1,3 +1,3 @@
  <configuration>
 -  <dllmap dll="gconf-2" target="libgconf-2@LIB_PREFIX@.4@LIB_SUFFIX@"/>
-+  <dllmap dll="gconf-2" target="libgconf-2@LIB_PREFIX@.5@LIB_SUFFIX@"/>
++  <dllmap dll="gconf-2" target="libgconf-2@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
diff --git a/x11-toolkits/gtk-sharp20/files/patch-gda_gda-sharp.dll.config.in b/x11-toolkits/gtk-sharp20/files/patch-gda_gda-sharp.dll.config.in
index efdd1407043f..dd496cd4542a 100644
--- a/x11-toolkits/gtk-sharp20/files/patch-gda_gda-sharp.dll.config.in
+++ b/x11-toolkits/gtk-sharp20/files/patch-gda_gda-sharp.dll.config.in
@@ -3,5 +3,5 @@
 @@ -1,3 +1,3 @@
  <configuration>
 -  <dllmap dll="gda-2" target="libgda-2@LIB_PREFIX@.1@LIB_SUFFIX@"/>
-+  <dllmap dll="gda-2" target="libgda-2@LIB_PREFIX@.2@LIB_SUFFIX@"/>
++  <dllmap dll="gda-2" target="libgda-2@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
diff --git a/x11-toolkits/gtk-sharp20/files/patch-gdk_gdk-sharp.dll.config.in b/x11-toolkits/gtk-sharp20/files/patch-gdk_gdk-sharp.dll.config.in
index 375dee3deb42..1473fcec44eb 100644
--- a/x11-toolkits/gtk-sharp20/files/patch-gdk_gdk-sharp.dll.config.in
+++ b/x11-toolkits/gtk-sharp20/files/patch-gdk_gdk-sharp.dll.config.in
@@ -6,8 +6,8 @@
 -  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 -  <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-x11-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 -  <dllmap dll="libgdk_pixbuf-2.0-0.dll" target="libgdk_pixbuf-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-+  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-x11-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libgdk_pixbuf-2.0-0.dll" target="libgdk_pixbuf-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
++  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-x11-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgdk_pixbuf-2.0-0.dll" target="libgdk_pixbuf-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
diff --git a/x11-toolkits/gtk-sharp20/files/patch-glade_glade-sharp.dll.config.in b/x11-toolkits/gtk-sharp20/files/patch-glade_glade-sharp.dll.config.in
new file mode 100644
index 000000000000..933e9dcb44a1
--- /dev/null
+++ b/x11-toolkits/gtk-sharp20/files/patch-glade_glade-sharp.dll.config.in
@@ -0,0 +1,7 @@
+--- glade/glade-sharp.dll.config.in.orig	Tue Jun 22 11:19:01 2004
++++ glade/glade-sharp.dll.config.in	Thu Aug 12 22:37:17 2004
+@@ -1,3 +1,3 @@
+ <configuration>
+-  <dllmap dll="libglade-2.0-0.dll" target="libglade-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
++  <dllmap dll="libglade-2.0-0.dll" target="libglade-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
+ </configuration>
diff --git a/x11-toolkits/gtk-sharp20/files/patch-glib_glib-sharp.dll.config.in b/x11-toolkits/gtk-sharp20/files/patch-glib_glib-sharp.dll.config.in
index f06de381f616..9416fd2480b5 100644
--- a/x11-toolkits/gtk-sharp20/files/patch-glib_glib-sharp.dll.config.in
+++ b/x11-toolkits/gtk-sharp20/files/patch-glib_glib-sharp.dll.config.in
@@ -5,7 +5,7 @@
 -  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 -  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 -  <dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-+  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
++  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
diff --git a/x11-toolkits/gtk-sharp20/files/patch-gnome_gnome-sharp.dll.config.in b/x11-toolkits/gtk-sharp20/files/patch-gnome_gnome-sharp.dll.config.in
index ee203c674abb..29e5230ba028 100644
--- a/x11-toolkits/gtk-sharp20/files/patch-gnome_gnome-sharp.dll.config.in
+++ b/x11-toolkits/gtk-sharp20/files/patch-gnome_gnome-sharp.dll.config.in
@@ -11,13 +11,13 @@
 -  <dllmap dll="gnomeprint-2-2" target="libgnomeprint-2-2@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 -  <dllmap dll="gnomeprintui-2-2" target="libgnomeprintui-2-2@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 -  <dllmap dll="gnomeui-2" target="libgnomeui-2@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-+  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="gnome-2" target="libgnome-2@LIB_PREFIX@.600@LIB_SUFFIX@"/>
-+  <dllmap dll="gnomecanvas-2" target="libgnomecanvas-2@LIB_PREFIX@.600@LIB_SUFFIX@"/>
-+  <dllmap dll="gnomeprint-2-2" target="libgnomeprint-2-2@LIB_PREFIX@.1@LIB_SUFFIX@"/>
-+  <dllmap dll="gnomeprintui-2-2" target="libgnomeprintui-2-2@LIB_PREFIX@.1@LIB_SUFFIX@"/>
-+  <dllmap dll="gnomeui-2" target="libgnomeui-2@LIB_PREFIX@.600@LIB_SUFFIX@"/>
++  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="gnome-2" target="libgnome-2@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="gnomecanvas-2" target="libgnomecanvas-2@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="gnomeprint-2-2" target="libgnomeprint-2-2@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="gnomeprintui-2-2" target="libgnomeprintui-2-2@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="gnomeui-2" target="libgnomeui-2@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
diff --git a/x11-toolkits/gtk-sharp20/files/patch-gnomedb_gnomedb-sharp.dll.config.in b/x11-toolkits/gtk-sharp20/files/patch-gnomedb_gnomedb-sharp.dll.config.in
new file mode 100644
index 000000000000..9a420cea3d69
--- /dev/null
+++ b/x11-toolkits/gtk-sharp20/files/patch-gnomedb_gnomedb-sharp.dll.config.in
@@ -0,0 +1,7 @@
+--- gnomedb/gnomedb-sharp.dll.config.in.orig	Tue Jun 22 11:19:01 2004
++++ gnomedb/gnomedb-sharp.dll.config.in	Thu Aug 12 22:39:24 2004
+@@ -1,3 +1,3 @@
+ <configuration>
+-  <dllmap dll="gnomedb-2" target="libgnomedb-2@LIB_PREFIX@.3@LIB_SUFFIX@"/>
++  <dllmap dll="gnomedb-2" target="libgnomedb-2@LIB_PREFIX@@LIB_SUFFIX@"/>
+ </configuration>
diff --git a/x11-toolkits/gtk-sharp20/files/patch-gtk_gtk-sharp.dll.config.in b/x11-toolkits/gtk-sharp20/files/patch-gtk_gtk-sharp.dll.config.in
index 968145c75d92..5954c89fa771 100644
--- a/x11-toolkits/gtk-sharp20/files/patch-gtk_gtk-sharp.dll.config.in
+++ b/x11-toolkits/gtk-sharp20/files/patch-gtk_gtk-sharp.dll.config.in
@@ -6,8 +6,8 @@
 -  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 -  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 -  <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-+  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.600@LIB_SUFFIX@"/>
-+  <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
++  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
diff --git a/x11-toolkits/gtk-sharp20/files/patch-gtkhtml_gtkhtml-sharp.dll.config.in b/x11-toolkits/gtk-sharp20/files/patch-gtkhtml_gtkhtml-sharp.dll.config.in
new file mode 100644
index 000000000000..7109eb4c853d
--- /dev/null
+++ b/x11-toolkits/gtk-sharp20/files/patch-gtkhtml_gtkhtml-sharp.dll.config.in
@@ -0,0 +1,7 @@
+--- gtkhtml/gtkhtml-sharp.dll.config.in.orig	Tue Jun 22 11:19:02 2004
++++ gtkhtml/gtkhtml-sharp.dll.config.in	Thu Aug 12 22:43:21 2004
+@@ -1,3 +1,3 @@
+ <configuration>
+-  <dllmap dll="gtkhtml-3.0" target="libgtkhtml-@GTKHTML_VERSION@@LIB_PREFIX@.@GTKHTML_SOVERSION@@LIB_SUFFIX@"/>
++  <dllmap dll="gtkhtml-3.0" target="libgtkhtml-@GTKHTML_VERSION@@LIB_PREFIX@@LIB_SUFFIX@"/>
+ </configuration>
diff --git a/x11-toolkits/gtk-sharp20/files/patch-pango_pango-sharp.dll.config.in b/x11-toolkits/gtk-sharp20/files/patch-pango_pango-sharp.dll.config.in
index 172b32ea9711..58b403b8255a 100644
--- a/x11-toolkits/gtk-sharp20/files/patch-pango_pango-sharp.dll.config.in
+++ b/x11-toolkits/gtk-sharp20/files/patch-pango_pango-sharp.dll.config.in
@@ -3,5 +3,5 @@
 @@ -1,3 +1,3 @@
  <configuration>
 -  <dllmap dll="libpango-1.0-0.dll" target="libpango-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-+  <dllmap dll="libpango-1.0-0.dll" target="libpango-1.0@LIB_PREFIX@.399@LIB_SUFFIX@"/>
++  <dllmap dll="libpango-1.0-0.dll" target="libpango-1.0@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
diff --git a/x11-toolkits/gtk-sharp20/files/patch-rsvg_rsvg-sharp.dll.config.in b/x11-toolkits/gtk-sharp20/files/patch-rsvg_rsvg-sharp.dll.config.in
index d842eea02368..1cc50160b1fe 100644
--- a/x11-toolkits/gtk-sharp20/files/patch-rsvg_rsvg-sharp.dll.config.in
+++ b/x11-toolkits/gtk-sharp20/files/patch-rsvg_rsvg-sharp.dll.config.in
@@ -3,5 +3,5 @@
 @@ -1,3 +1,3 @@
  <configuration>
 -  <dllmap dll="rsvg-2" target="librsvg-2@LIB_PREFIX@.2@LIB_SUFFIX@"/>
-+  <dllmap dll="rsvg-2" target="librsvg-2@LIB_PREFIX@.8@LIB_SUFFIX@"/>
++  <dllmap dll="rsvg-2" target="librsvg-2@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
diff --git a/x11-toolkits/gtk-sharp20/files/patch-vte_vte-sharp.dll.config.in b/x11-toolkits/gtk-sharp20/files/patch-vte_vte-sharp.dll.config.in
index 8eea6a77b670..66cf7a773e4c 100644
--- a/x11-toolkits/gtk-sharp20/files/patch-vte_vte-sharp.dll.config.in
+++ b/x11-toolkits/gtk-sharp20/files/patch-vte_vte-sharp.dll.config.in
@@ -4,6 +4,6 @@
  <configuration>
 -  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 -  <dllmap dll="vte" target="libvte@LIB_PREFIX@.4@LIB_SUFFIX@"/>
-+  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.600@LIB_SUFFIX@"/>
-+  <dllmap dll="vte" target="libvte@LIB_PREFIX@.8@LIB_SUFFIX@"/>
++  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="vte" target="libvte@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>