Switch C# gnome bindings to latest mono. Update to gtk-sharp-2.12.26 on

this ocassion.

8 files changed, 16 insertions, 66 deletions

diff --git a/x11/gnome-sharp/Makefile b/x11/gnome-sharp/Makefile
index 99922342487..4e3f5d04568 100644
--- a/x11/gnome-sharp/Makefile
+++ b/x11/gnome-sharp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.57 2015/04/25 14:25:05 tnn Exp $
+# $NetBSD: Makefile,v 1.58 2015/05/23 06:51:21 kefren Exp $
 #
 
 DISTNAME=	gnome-sharp-2.24.2
-PKGREVISION=	35
+PKGREVISION=	36
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-sharp/2.24/}
 
@@ -44,7 +44,7 @@ BUILDLINK_API_DEPENDS.libart+=		libart>=2.3.20
 .include "../../graphics/libart/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libgnomecanvas+=	libgnomecanvas>=2.20.0
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
-.include "../../lang/mono2/buildlink3.mk"
+.include "../../lang/mono/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gnome-vfs+=	gnome-vfs>=2.22.0
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gtk2+=		gtk2+>=2.13.0
diff --git a/x11/gnome-sharp/buildlink3.mk b/x11/gnome-sharp/buildlink3.mk
index a559a375d20..6cd810488de 100644
--- a/x11/gnome-sharp/buildlink3.mk
+++ b/x11/gnome-sharp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.47 2015/04/25 14:25:05 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.48 2015/05/23 06:51:21 kefren Exp $
 
 BUILDLINK_TREE+=	gnome-sharp
 
@@ -12,7 +12,7 @@ BUILDLINK_PKGSRCDIR.gnome-sharp?=	../../x11/gnome-sharp
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../graphics/libart/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
-.include "../../lang/mono2/buildlink3.mk"
+.include "../../lang/mono/buildlink3.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/gtk-sharp/buildlink3.mk"
diff --git a/x11/gtk-sharp/Makefile b/x11/gtk-sharp/Makefile
index cde0178c27f..c4e17202b61 100644
--- a/x11/gtk-sharp/Makefile
+++ b/x11/gtk-sharp/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.50 2015/04/25 14:25:05 tnn Exp $
+# $NetBSD: Makefile,v 1.51 2015/05/23 06:51:21 kefren Exp $
 #
 
-DISTNAME=		gtk-sharp-2.12.10
-PKGREVISION=		33
+DISTNAME=		gtk-sharp-2.12.26
 CATEGORIES=		x11
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gtk-sharp/2.12/}
-EXTRACT_SUFX=		.tar.bz2
+MASTER_SITES=		http://download.mono-project.com/sources/gtk-sharp212/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.mono-project.com/GtkSharp
@@ -35,7 +33,7 @@ SUBST_FILES.relprefix=	${PKGCONFIG_OVERRIDE}
 SUBST_SED.relprefix=	-e 's|$${pcfiledir}/../..|@prefix@|g'
 
 .include "../../devel/libglade/buildlink3.mk"
-.include "../../lang/mono2/buildlink3.mk"
+.include "../../lang/mono/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.12.0
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtk-sharp/distinfo b/x11/gtk-sharp/distinfo
index fbc28c2a2c0..dfa20c5eb4e 100644
--- a/x11/gtk-sharp/distinfo
+++ b/x11/gtk-sharp/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.11 2012/05/03 06:03:30 wiz Exp $
+$NetBSD: distinfo,v 1.12 2015/05/23 06:51:21 kefren Exp $
 
-SHA1 (gtk-sharp-2.12.10.tar.bz2) = 10cef6b1bb9a8a33f9cc32ffeb7b34577c90b393
-RMD160 (gtk-sharp-2.12.10.tar.bz2) = 8eed70310b961d823cf9c7766aa3a5fdfd5e5d05
-Size (gtk-sharp-2.12.10.tar.bz2) = 1638263 bytes
-SHA1 (patch-glib_glue_list.c) = b72408763d30696a50bc5c860707b70e6ac08bce
-SHA1 (patch-glib_glue_slist.c) = 39d1aac799ca5312a53a1f69570e671322864efa
-SHA1 (patch-glib_glue_thread.c) = b04ee63877aa50fa9fa945256fa89611d5931337
+SHA1 (gtk-sharp-2.12.26.tar.gz) = 2f5007362f374a5a967dc6b16cdaaf3921dad1fa
+RMD160 (gtk-sharp-2.12.26.tar.gz) = 3a6dd0b948f2b244611875f64c250602779ecdd2
+Size (gtk-sharp-2.12.26.tar.gz) = 2609690 bytes
diff --git a/x11/gtk-sharp/patches/patch-glib_glue_list.c b/x11/gtk-sharp/patches/patch-glib_glue_list.c
deleted file mode 100644
index 2433813bcfc..00000000000
--- a/x11/gtk-sharp/patches/patch-glib_glue_list.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-glib_glue_list.c,v 1.1 2012/05/03 06:03:30 wiz Exp $
-
-Adapt for glib-2.32.
-
---- glib/glue/list.c.orig	2009-01-07 16:54:06.000000000 +0000
-+++ glib/glue/list.c
-@@ -20,7 +20,7 @@
-  */
- 
- 
--#include <glib/glist.h>
-+#include <glib.h>
- 
- /* Forward declarations */
- gpointer gtksharp_list_get_data (GList *l);
diff --git a/x11/gtk-sharp/patches/patch-glib_glue_slist.c b/x11/gtk-sharp/patches/patch-glib_glue_slist.c
deleted file mode 100644
index efcfc5393e2..00000000000
--- a/x11/gtk-sharp/patches/patch-glib_glue_slist.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-glib_glue_slist.c,v 1.1 2012/05/03 06:03:30 wiz Exp $
-
-Adapt for glib-2.32.
-
---- glib/glue/slist.c.orig	2009-01-07 16:54:06.000000000 +0000
-+++ glib/glue/slist.c
-@@ -20,7 +20,7 @@
-  */
- 
- 
--#include <glib/gslist.h>
-+#include <glib.h>
- 
- /* Forward declarations */
- gpointer gtksharp_slist_get_data (GSList *l);
diff --git a/x11/gtk-sharp/patches/patch-glib_glue_thread.c b/x11/gtk-sharp/patches/patch-glib_glue_thread.c
deleted file mode 100644
index 3d815d97f22..00000000000
--- a/x11/gtk-sharp/patches/patch-glib_glue_thread.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-glib_glue_thread.c,v 1.1 2012/05/03 06:03:30 wiz Exp $
-
-Adapt for glib-2.32.
-
---- glib/glue/thread.c.orig	2009-01-07 16:54:06.000000000 +0000
-+++ glib/glue/thread.c
-@@ -20,7 +20,7 @@
-  */
- 
- 
--#include <glib/gthread.h>
-+#include <glib.h>
- 
- gboolean glibsharp_g_thread_supported (void);
- 
diff --git a/x11/gtksourceview-sharp2/Makefile b/x11/gtksourceview-sharp2/Makefile
index 3cbfc6634a6..02468aaaf8a 100644
--- a/x11/gtksourceview-sharp2/Makefile
+++ b/x11/gtksourceview-sharp2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.54 2015/04/25 14:25:07 tnn Exp $
+# $NetBSD: Makefile,v 1.55 2015/05/23 06:51:21 kefren Exp $
 
 DISTNAME=	gtksourceview-sharp-2.0-0.12
 PKGNAME=	${DISTNAME:S/-2.0-/2-/}
-PKGREVISION=	47
+PKGREVISION=	48
 CATEGORIES=	x11
 MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/gtksourceview-sharp2/
 EXTRACT_SUFX=	.tar.bz2
@@ -19,7 +19,7 @@ USE_TOOLS+=	gmake pkg-config
 
 CONFLICTS=	gtksourceview-sharp-2.0-[0-9]*
 
-.include "../../lang/mono2/buildlink3.mk"
+.include "../../lang/mono/buildlink3.mk"
 .include "../../x11/gtksourceview/buildlink3.mk"
 .include "../../x11/gtk-sharp/buildlink3.mk"
 .include "../../x11/gnome-sharp/buildlink3.mk"