7 files changed, 22 insertions, 33 deletions

diff --git a/x11-toolkits/gnome-desktop-sharp20/Makefile b/x11-toolkits/gnome-desktop-sharp20/Makefile
index da72e8ff552e..36953ad77c02 100644
--- a/x11-toolkits/gnome-desktop-sharp20/Makefile
+++ b/x11-toolkits/gnome-desktop-sharp20/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-desktop-sharp
 PORTVERSION=	2.26.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME
 
diff --git a/x11-toolkits/gnome-desktop-sharp20/files/patch-gnomedesktop_gnomedesktop-sharp.dll.config.in b/x11-toolkits/gnome-desktop-sharp20/files/patch-gnomedesktop_gnomedesktop-sharp.dll.config.in
new file mode 100644
index 000000000000..cef33aba7a26
--- /dev/null
+++ b/x11-toolkits/gnome-desktop-sharp20/files/patch-gnomedesktop_gnomedesktop-sharp.dll.config.in
@@ -0,0 +1,12 @@
+
+$FreeBSD$
+
+--- gnomedesktop/gnomedesktop-sharp.dll.config.in.orig
++++ gnomedesktop/gnomedesktop-sharp.dll.config.in
+@@ -3,5 +3,5 @@
+   <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="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
+-  <dllmap dll="gnome-desktop-2" target="libgnome-desktop-2@LIB_PREFIX@.11@LIB_SUFFIX@"/>
++  <dllmap dll="gnome-desktop-2" target="libgnome-desktop-2@LIB_PREFIX@@LIB_SUFFIX@"/>
+ </configuration>
diff --git a/x11-toolkits/gtk-sharp20/Makefile b/x11-toolkits/gtk-sharp20/Makefile
index 11386258162e..7b800737e5b2 100644
--- a/x11-toolkits/gtk-sharp20/Makefile
+++ b/x11-toolkits/gtk-sharp20/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	gtk-sharp
-PORTVERSION=	2.12.9
-PORTREVISION=	3
+PORTVERSION=	2.12.10
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME
 
diff --git a/x11-toolkits/gtk-sharp20/distinfo b/x11-toolkits/gtk-sharp20/distinfo
index d95ac5b5f981..5821a01089d6 100644
--- a/x11-toolkits/gtk-sharp20/distinfo
+++ b/x11-toolkits/gtk-sharp20/distinfo
@@ -1,3 +1,3 @@
-MD5 (gtk-sharp-2.12.9.tar.bz2) = 2619f6cbba514f10582f8961ed84063b
-SHA256 (gtk-sharp-2.12.9.tar.bz2) = d580bd03246b7885de8d4271ea736eb0925153a08a396d6b382c8193a0ed7beb
-SIZE (gtk-sharp-2.12.9.tar.bz2) = 1606047
+MD5 (gtk-sharp-2.12.10.tar.bz2) = 6f836ac05aaaa3ab3dca61c84f0b68a2
+SHA256 (gtk-sharp-2.12.10.tar.bz2) = aaa53f7916f25f0f83760b6ffbf0d465d13ecfa55aa645603f1ca876b7d0f770
+SIZE (gtk-sharp-2.12.10.tar.bz2) = 1638263
diff --git a/x11-toolkits/libgdiplus/Makefile b/x11-toolkits/libgdiplus/Makefile
index a42f9a6ed710..a14b54e9af17 100644
--- a/x11-toolkits/libgdiplus/Makefile
+++ b/x11-toolkits/libgdiplus/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	libgdiplus
-PORTVERSION=	2.4.2
-PORTREVISION=	3
+PORTVERSION=	2.6.4
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/${PORTNAME}/
 
@@ -27,8 +26,7 @@ USE_LDCONFIG=   yes
 LIBTOOLFILES=	configure cairo/configure
 USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
-		png_REQUIRES="libpng"
+		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 # Included cairo does not work for us.  Enable below when Mono catches
 # up with our port.  For now, use included but patch out glitz manually.
 #CONFIGURE_ARGS+= --with-cairo=installed
diff --git a/x11-toolkits/libgdiplus/distinfo b/x11-toolkits/libgdiplus/distinfo
index b60c0da20d36..72832a668ca7 100644
--- a/x11-toolkits/libgdiplus/distinfo
+++ b/x11-toolkits/libgdiplus/distinfo
@@ -1,3 +1,3 @@
-MD5 (libgdiplus-2.4.2.tar.bz2) = 703210950bce2ed0a9824f897f774925
-SHA256 (libgdiplus-2.4.2.tar.bz2) = 5135e3abd51f2a836cd6065e2dede3b073f93ed9436f3e201a14f3019aa717b6
-SIZE (libgdiplus-2.4.2.tar.bz2) = 1975307
+MD5 (libgdiplus-2.6.4.tar.bz2) = d860cfca4c13fbbaa054077eda3ab97b
+SHA256 (libgdiplus-2.6.4.tar.bz2) = 0f750f7f6696c329b4209230d355599cbf47570b4f899777e5ecb5fccc884833
+SIZE (libgdiplus-2.6.4.tar.bz2) = 1959635
diff --git a/x11-toolkits/libgdiplus/files/patch-pngcodec.c b/x11-toolkits/libgdiplus/files/patch-pngcodec.c
deleted file mode 100644
index ee59278468dc..000000000000
--- a/x11-toolkits/libgdiplus/files/patch-pngcodec.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/pngcodec.c.orig	2009-06-08 19:30:15.000000000 +0200
-+++ src/pngcodec.c	2010-03-28 15:27:01.000000000 +0200
-@@ -352,7 +352,7 @@
- 						info_ptr->palette[i].blue,
- 						info_ptr->palette[i].green,
- 						info_ptr->palette[i].red,
--						info_ptr->trans[i]); /* alpha */
-+						info_ptr->trans_alpha[i]); /* alpha */
- 			}
- 		}
- 
-@@ -418,7 +418,7 @@
- 		}
- 
- 		if ((color_type == PNG_COLOR_TYPE_GRAY) && (bit_depth < 8)) {
--			png_set_gray_1_2_4_to_8(png_ptr);
-+			png_set_expand_gray_1_2_4_to_8(png_ptr);
- 		}
- 
- 		if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {