Update to 2.24.0:

2008-08-06  Mike Kestner  <mkestner@novell.com>

	* *: Update to Gnome 2.23.5 release API.  Remove print and panel
	APIs from gnome-sharp.dll into their own assemblies now located in
	gnome-desktop-sharp.

2008-05-14  Stephane Delcroix  <sdelcroix@novell.com>

	* gconf/GConf/gconf-sharp.dll.config.in:
	* gconf/GConf/ClientBase.cs: use GType.Init () instead of
	g_type_init ();

4 files changed, 36 insertions, 132 deletions

diff --git a/x11/gnome-sharp/Makefile b/x11/gnome-sharp/Makefile
index c88b90836aa..2ea5e47ec56 100644
--- a/x11/gnome-sharp/Makefile
+++ b/x11/gnome-sharp/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2008/09/06 20:54:34 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2008/10/24 20:51:11 wiz Exp $
 #
 
-DISTNAME=	gnome-sharp-2.20.1
-PKGREVISION=	1
+DISTNAME=	gnome-sharp-2.24.0
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-sharp/2.20/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-sharp/2.24/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.mono-project.com/GtkSharp
@@ -29,13 +28,17 @@ SUBST_FILES.pc=		${PKGCONFIG_OVERRIDE}
 SUBST_SED.pc=		-e "s|\$${pcfiledir}/../..|@prefix@|g"
 SUBST_MESSAGE.pc=	Fixing hardcoded paths.
 
+BUILDLINK_API_DEPENDS.libgnomeui+=	libgnomeui>=2.23.0
 .include "../../devel/libgnomeui/buildlink3.mk"
+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/mono/buildlink3.mk"
-.include "../../lang/monodoc/buildlink3.mk"
-.include "../../print/libgnomeprintui/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gnome-vfs+=	gnome-vfs>=2.22.0
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
-.include "../../x11/gnome-panel/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gtk2+=		gtk2+>=2.13.0
 .include "../../x11/gtk2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gtk-sharp+=	gtk-sharp>=2.12.2
 .include "../../x11/gtk-sharp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome-sharp/PLIST b/x11/gnome-sharp/PLIST
index 82ba5e9301d..88edac2fe34 100644
--- a/x11/gnome-sharp/PLIST
+++ b/x11/gnome-sharp/PLIST
@@ -1,81 +1,21 @@
-@comment $NetBSD: PLIST,v 1.3 2008/04/27 23:03:09 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2008/10/24 20:51:11 wiz Exp $
 bin/gconfsharp2-schemagen
 lib/gtk-sharp-2.0/gconfsharp-schemagen.exe
 lib/libgnomesharpglue-2.la
-lib/mono/gac/art-sharp/2.20.0.0__35e10195dab3c99f/art-sharp.dll
-lib/mono/gac/art-sharp/2.20.0.0__35e10195dab3c99f/art-sharp.dll.config
-lib/mono/gac/gconf-sharp-peditors/2.20.0.0__35e10195dab3c99f/gconf-sharp-peditors.dll
-lib/mono/gac/gconf-sharp/2.20.0.0__35e10195dab3c99f/gconf-sharp.dll
-lib/mono/gac/gconf-sharp/2.20.0.0__35e10195dab3c99f/gconf-sharp.dll.config
-lib/mono/gac/gnome-sharp/2.20.0.0__35e10195dab3c99f/gnome-sharp.dll
-lib/mono/gac/gnome-sharp/2.20.0.0__35e10195dab3c99f/gnome-sharp.dll.config
-lib/mono/gac/gnome-vfs-sharp/2.20.0.0__35e10195dab3c99f/gnome-vfs-sharp.dll
-lib/mono/gac/gnome-vfs-sharp/2.20.0.0__35e10195dab3c99f/gnome-vfs-sharp.dll.config
-lib/mono/gac/policy.2.16.art-sharp/0.0.0.0__35e10195dab3c99f/policy.2.16.art-sharp.dll
-lib/mono/gac/policy.2.16.art-sharp/0.0.0.0__35e10195dab3c99f/policy.2.16.config
-lib/mono/gac/policy.2.16.gconf-sharp-peditors/0.0.0.0__35e10195dab3c99f/policy.2.16.config
-lib/mono/gac/policy.2.16.gconf-sharp-peditors/0.0.0.0__35e10195dab3c99f/policy.2.16.gconf-sharp-peditors.dll
-lib/mono/gac/policy.2.16.gconf-sharp/0.0.0.0__35e10195dab3c99f/policy.2.16.config
-lib/mono/gac/policy.2.16.gconf-sharp/0.0.0.0__35e10195dab3c99f/policy.2.16.gconf-sharp.dll
-lib/mono/gac/policy.2.16.gnome-sharp/0.0.0.0__35e10195dab3c99f/policy.2.16.config
-lib/mono/gac/policy.2.16.gnome-sharp/0.0.0.0__35e10195dab3c99f/policy.2.16.gnome-sharp.dll
-lib/mono/gac/policy.2.16.gnome-vfs-sharp/0.0.0.0__35e10195dab3c99f/policy.2.16.config
-lib/mono/gac/policy.2.16.gnome-vfs-sharp/0.0.0.0__35e10195dab3c99f/policy.2.16.gnome-vfs-sharp.dll
-lib/mono/gac/policy.2.4.art-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.art-sharp.dll
-lib/mono/gac/policy.2.4.art-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.config
-lib/mono/gac/policy.2.4.gconf-sharp-peditors/0.0.0.0__35e10195dab3c99f/policy.2.4.config
-lib/mono/gac/policy.2.4.gconf-sharp-peditors/0.0.0.0__35e10195dab3c99f/policy.2.4.gconf-sharp-peditors.dll
-lib/mono/gac/policy.2.4.gconf-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.config
-lib/mono/gac/policy.2.4.gconf-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.gconf-sharp.dll
-lib/mono/gac/policy.2.4.gnome-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.config
-lib/mono/gac/policy.2.4.gnome-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.gnome-sharp.dll
-lib/mono/gac/policy.2.4.gnome-vfs-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.config
-lib/mono/gac/policy.2.4.gnome-vfs-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.gnome-vfs-sharp.dll
-lib/mono/gac/policy.2.6.art-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.art-sharp.dll
-lib/mono/gac/policy.2.6.art-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.config
-lib/mono/gac/policy.2.6.gconf-sharp-peditors/0.0.0.0__35e10195dab3c99f/policy.2.6.config
-lib/mono/gac/policy.2.6.gconf-sharp-peditors/0.0.0.0__35e10195dab3c99f/policy.2.6.gconf-sharp-peditors.dll
-lib/mono/gac/policy.2.6.gconf-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.config
-lib/mono/gac/policy.2.6.gconf-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.gconf-sharp.dll
-lib/mono/gac/policy.2.6.gnome-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.config
-lib/mono/gac/policy.2.6.gnome-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.gnome-sharp.dll
-lib/mono/gac/policy.2.6.gnome-vfs-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.config
-lib/mono/gac/policy.2.6.gnome-vfs-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.gnome-vfs-sharp.dll
-lib/mono/gac/policy.2.8.art-sharp/0.0.0.0__35e10195dab3c99f/policy.2.8.art-sharp.dll
-lib/mono/gac/policy.2.8.art-sharp/0.0.0.0__35e10195dab3c99f/policy.2.8.config
-lib/mono/gac/policy.2.8.gconf-sharp-peditors/0.0.0.0__35e10195dab3c99f/policy.2.8.config
-lib/mono/gac/policy.2.8.gconf-sharp-peditors/0.0.0.0__35e10195dab3c99f/policy.2.8.gconf-sharp-peditors.dll
-lib/mono/gac/policy.2.8.gconf-sharp/0.0.0.0__35e10195dab3c99f/policy.2.8.config
-lib/mono/gac/policy.2.8.gconf-sharp/0.0.0.0__35e10195dab3c99f/policy.2.8.gconf-sharp.dll
-lib/mono/gac/policy.2.8.gnome-sharp/0.0.0.0__35e10195dab3c99f/policy.2.8.config
-lib/mono/gac/policy.2.8.gnome-sharp/0.0.0.0__35e10195dab3c99f/policy.2.8.gnome-sharp.dll
-lib/mono/gac/policy.2.8.gnome-vfs-sharp/0.0.0.0__35e10195dab3c99f/policy.2.8.config
-lib/mono/gac/policy.2.8.gnome-vfs-sharp/0.0.0.0__35e10195dab3c99f/policy.2.8.gnome-vfs-sharp.dll
+lib/mono/gac/art-sharp/${PKGVERSION}.0__35e10195dab3c99f/art-sharp.dll
+lib/mono/gac/art-sharp/${PKGVERSION}.0__35e10195dab3c99f/art-sharp.dll.config
+lib/mono/gac/gconf-sharp-peditors/${PKGVERSION}.0__35e10195dab3c99f/gconf-sharp-peditors.dll
+lib/mono/gac/gconf-sharp/${PKGVERSION}.0__35e10195dab3c99f/gconf-sharp.dll
+lib/mono/gac/gconf-sharp/${PKGVERSION}.0__35e10195dab3c99f/gconf-sharp.dll.config
+lib/mono/gac/gnome-sharp/${PKGVERSION}.0__35e10195dab3c99f/gnome-sharp.dll
+lib/mono/gac/gnome-sharp/${PKGVERSION}.0__35e10195dab3c99f/gnome-sharp.dll.config
+lib/mono/gac/gnome-vfs-sharp/${PKGVERSION}.0__35e10195dab3c99f/gnome-vfs-sharp.dll
+lib/mono/gac/gnome-vfs-sharp/${PKGVERSION}.0__35e10195dab3c99f/gnome-vfs-sharp.dll.config
 lib/mono/gtk-sharp-2.0/art-sharp.dll
 lib/mono/gtk-sharp-2.0/gconf-sharp-peditors.dll
 lib/mono/gtk-sharp-2.0/gconf-sharp.dll
 lib/mono/gtk-sharp-2.0/gnome-sharp.dll
 lib/mono/gtk-sharp-2.0/gnome-vfs-sharp.dll
-lib/mono/gtk-sharp-2.0/policy.2.16.art-sharp.dll
-lib/mono/gtk-sharp-2.0/policy.2.16.gconf-sharp-peditors.dll
-lib/mono/gtk-sharp-2.0/policy.2.16.gconf-sharp.dll
-lib/mono/gtk-sharp-2.0/policy.2.16.gnome-sharp.dll
-lib/mono/gtk-sharp-2.0/policy.2.16.gnome-vfs-sharp.dll
-lib/mono/gtk-sharp-2.0/policy.2.4.art-sharp.dll
-lib/mono/gtk-sharp-2.0/policy.2.4.gconf-sharp-peditors.dll
-lib/mono/gtk-sharp-2.0/policy.2.4.gconf-sharp.dll
-lib/mono/gtk-sharp-2.0/policy.2.4.gnome-sharp.dll
-lib/mono/gtk-sharp-2.0/policy.2.4.gnome-vfs-sharp.dll
-lib/mono/gtk-sharp-2.0/policy.2.6.art-sharp.dll
-lib/mono/gtk-sharp-2.0/policy.2.6.gconf-sharp-peditors.dll
-lib/mono/gtk-sharp-2.0/policy.2.6.gconf-sharp.dll
-lib/mono/gtk-sharp-2.0/policy.2.6.gnome-sharp.dll
-lib/mono/gtk-sharp-2.0/policy.2.6.gnome-vfs-sharp.dll
-lib/mono/gtk-sharp-2.0/policy.2.8.art-sharp.dll
-lib/mono/gtk-sharp-2.0/policy.2.8.gconf-sharp-peditors.dll
-lib/mono/gtk-sharp-2.0/policy.2.8.gconf-sharp.dll
-lib/mono/gtk-sharp-2.0/policy.2.8.gnome-sharp.dll
-lib/mono/gtk-sharp-2.0/policy.2.8.gnome-vfs-sharp.dll
 lib/pkgconfig/art-sharp-2.0.pc
 lib/pkgconfig/gconf-sharp-2.0.pc
 lib/pkgconfig/gconf-sharp-peditors-2.0.pc
@@ -84,53 +24,17 @@ lib/pkgconfig/gnome-vfs-sharp-2.0.pc
 share/gapi-2.0/art-api.xml
 share/gapi-2.0/gnome-api.xml
 share/gapi-2.0/gnome-vfs-api.xml
-@dirrm lib/mono/gac/policy.2.8.gnome-vfs-sharp/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.8.gnome-vfs-sharp
-@dirrm lib/mono/gac/policy.2.8.gnome-sharp/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.8.gnome-sharp
-@dirrm lib/mono/gac/policy.2.8.gconf-sharp/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.8.gconf-sharp-peditors/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.8.gconf-sharp-peditors
-@dirrm lib/mono/gac/policy.2.8.gconf-sharp
-@dirrm lib/mono/gac/policy.2.8.art-sharp/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.8.art-sharp
-@dirrm lib/mono/gac/policy.2.6.gnome-vfs-sharp/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.6.gnome-vfs-sharp
-@dirrm lib/mono/gac/policy.2.6.gnome-sharp/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.6.gnome-sharp
-@dirrm lib/mono/gac/policy.2.6.gconf-sharp/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.6.gconf-sharp-peditors/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.6.gconf-sharp-peditors
-@dirrm lib/mono/gac/policy.2.6.gconf-sharp
-@dirrm lib/mono/gac/policy.2.6.art-sharp/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.6.art-sharp
-@dirrm lib/mono/gac/policy.2.4.gnome-vfs-sharp/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.4.gnome-vfs-sharp
-@dirrm lib/mono/gac/policy.2.4.gnome-sharp/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.4.gnome-sharp
-@dirrm lib/mono/gac/policy.2.4.gconf-sharp/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.4.gconf-sharp-peditors/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.4.gconf-sharp-peditors
-@dirrm lib/mono/gac/policy.2.4.gconf-sharp
-@dirrm lib/mono/gac/policy.2.4.art-sharp/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.4.art-sharp
-@dirrm lib/mono/gac/policy.2.16.gnome-vfs-sharp/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.16.gnome-vfs-sharp
-@dirrm lib/mono/gac/policy.2.16.gnome-sharp/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.16.gnome-sharp
-@dirrm lib/mono/gac/policy.2.16.gconf-sharp/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.16.gconf-sharp-peditors/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.16.gconf-sharp-peditors
-@dirrm lib/mono/gac/policy.2.16.gconf-sharp
-@dirrm lib/mono/gac/policy.2.16.art-sharp/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.16.art-sharp
-@dirrm lib/mono/gac/gnome-vfs-sharp/2.20.0.0__35e10195dab3c99f
+@comment in gtk-sharp: @dirrm share/gapi-2.0
+@comment in gtk-sharp: @dirrm lib/mono/gtk-sharp-2.0
+@dirrm lib/mono/gac/gnome-vfs-sharp/${PKGVERSION}.0__35e10195dab3c99f
 @dirrm lib/mono/gac/gnome-vfs-sharp
-@dirrm lib/mono/gac/gnome-sharp/2.20.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gnome-sharp/${PKGVERSION}.0__35e10195dab3c99f
 @dirrm lib/mono/gac/gnome-sharp
-@dirrm lib/mono/gac/gconf-sharp/2.20.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/gconf-sharp-peditors/2.20.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gconf-sharp/${PKGVERSION}.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gconf-sharp-peditors/${PKGVERSION}.0__35e10195dab3c99f
 @dirrm lib/mono/gac/gconf-sharp-peditors
 @dirrm lib/mono/gac/gconf-sharp
-@dirrm lib/mono/gac/art-sharp/2.20.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/art-sharp/${PKGVERSION}.0__35e10195dab3c99f
 @dirrm lib/mono/gac/art-sharp
+@comment in mono: @dirrm lib/mono/gac
+@comment in gtk-sharp: @dirrm lib/gtk-sharp-2.0
diff --git a/x11/gnome-sharp/buildlink3.mk b/x11/gnome-sharp/buildlink3.mk
index f550efa6e0a..98cefef5b4f 100644
--- a/x11/gnome-sharp/buildlink3.mk
+++ b/x11/gnome-sharp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2008/09/06 20:54:34 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2008/10/24 20:51:11 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_SHARP_BUILDLINK3_MK:=	${GNOME_SHARP_BUILDLINK3_MK}+
@@ -12,18 +12,15 @@ BUILDLINK_PACKAGES+=	gnome-sharp
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-sharp
 
 .if ${GNOME_SHARP_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.gnome-sharp+=	gnome-sharp>=2.20.1
-BUILDLINK_ABI_DEPENDS.gnome-sharp?=	gnome-sharp>=2.20.1nb1
+BUILDLINK_API_DEPENDS.gnome-sharp+=	gnome-sharp>=2.24.0
 BUILDLINK_PKGSRCDIR.gnome-sharp?=	../../x11/gnome-sharp
 .endif	# GNOME_SHARP_BUILDLINK3_MK
 
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../graphics/libart/buildlink3.mk"
+.include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../lang/mono/buildlink3.mk"
-.include "../../lang/monodoc/buildlink3.mk"
-.include "../../print/libgnomeprintui/buildlink3.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
-.include "../../x11/gnome-panel/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/gtk-sharp/buildlink3.mk"
 
diff --git a/x11/gnome-sharp/distinfo b/x11/gnome-sharp/distinfo
index a5510f7f898..f7d015d3ea4 100644
--- a/x11/gnome-sharp/distinfo
+++ b/x11/gnome-sharp/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2008/04/27 23:03:09 wiz Exp $
+$NetBSD: distinfo,v 1.3 2008/10/24 20:51:11 wiz Exp $
 
-SHA1 (gnome-sharp-2.20.1.tar.gz) = 9066b1c1539f144adaf3d9e02e6eabd05e481589
-RMD160 (gnome-sharp-2.20.1.tar.gz) = 4b3d0e9fb1510b9080981c2471512181cb40152a
-Size (gnome-sharp-2.20.1.tar.gz) = 604547 bytes
+SHA1 (gnome-sharp-2.24.0.tar.gz) = 0316fcd98bb39992fa40161c7a550ed12eb63eec
+RMD160 (gnome-sharp-2.24.0.tar.gz) = 7102548ae9fefb70624fb9d61f3fed6fdaf666ec
+Size (gnome-sharp-2.24.0.tar.gz) = 589478 bytes