Update to 2.20.1.

Parts were split off into a separate package which I'll commit shortly,
gnome-desktop-sharp.

Changes:
* bootstrap-2.20: bump version.
* bootstrap-generic: substitute the GTK_SHARP_REQUIRED_VERSION.
* bootstrap-2.20: check for gtk 2.12.0 and gtk-sharp 2.12.1.
* configure.in.in: separate the gtk+ and gtk-sharp version variables.
* gnome/Program.custom: use GLib.Object.Harden to avoid some
reflection.
* bootstrap-2.20: bump gtk-sharp requirement to 2.12.1.
* gnome/Program.custom: revert QuitPrepare hook and instead do an
obnoxious hack to disable the toggle_ref mechanism for GnomeProgram.
Uses reflection since I didn't want to expose this hack in the public
GLib.Object API.
* gnome/Program.custom: hook into Gtk.Application.QuitPrepare to
dispose our managed resources prior to invoking gtk_main_quit.  Avoids
a crash on exit() in toggle_ref usage after managed releases have been
released.
* bootstrap-2.20: bump version and tag.
* gnome/gnome-api-2.20.raw: reparse
* sources/gnome-sharp-2.20-sources.xml: hide private gailcanvas hdrs.
hide gnome-print-gdi.h.
* bootstrap-2.20: bump svn version.
* gnome/Gnome.metadata: hide new Global class which was hiding
stable API.  [Fixes #356649]
* configure.in.in: integrate build service patch from Wade.
* bootstrap-2.20: update to version 2.19.90.
* * Move to 2.20 API.
* configure.in.in: move vte, rsvg, and gtkhtml to gnome-desktop-sharp.
* Makefile.am: ditto
* sample/Makefile.am: ditto
* Makefile.include: some refinement of the variable mangling.
* configure.in.in: expand new pc.in.
* gconf/GConf/gconf-sharp-2.0.pc.in: remove gnome-sharp Requires and
peditors.dll from the Libs: var.
* gconf/GConf.PropertyEditors/Makefile.am: install new pc.
* gconf/GConf.PropertyEditors/gconf-sharp-peditors-2.0.pc.in: expose
new pc file since this is conditional and the gconf-sharp.dll build
is not.
* gconf/GConf/Makefile.am: Copy AssemblyInfo.cs to the current dir so
that csc can find it.  (csc doesn't understand ../..)
* gconf/GConf/Makefile.am:
* gconf/GConf.PropertyEditors/Makefile.am:
use top_builddir instead of .. to avoid win32 build issues.
* gconf/GConf/Makefile.am: remove GNOME condition.  It's only needed
on the peditor build.
* gnome/CanvasItem.custom: marshal GType as IntPtr.
[Fixes comment #8 of 327058]
* gconf/GConf/Value.cs: Deal with zero length arrays gracefully.
Thanks to Sebastian Dröge <slomo@circular-chaos.org> for a
patch this one was derived from.  [Fixes #325516]
* AssembyInfo.cs.in : add [IgnoreClassInitializers]
* vte/Vte.metadata : rule from Peter Johanson to mark a string
const.
* gnome/CanvasPathDef.custom : adapt to generated pinvoke sig change.
* configure.in.in : add blurb about the gnome-sharp.dll requirements
since it seems to be a FAQ for people trying to build from sources.
* bootstrap-generic : use automake --foreign to keep automake-1.10 from
blowing up on the gnu make function usage.  grrr.
* sample/gconf/Makefile.am : use install-data-hook to make 1.10 happy.
* gconf/tools/gconfsharp2-schemagen.in:
Revert unportable 'relocatable' wrapper using which (doesn't work with symlinks)
* gconf/GConf/Value.cs: Allow the storage of empty lists in
gconf-sharp.

4 files changed, 49 insertions, 105 deletions

diff --git a/x11/gnome-sharp/Makefile b/x11/gnome-sharp/Makefile
index 59a2b2fab4e..c4953a4bfe8 100644
--- a/x11/gnome-sharp/Makefile
+++ b/x11/gnome-sharp/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2008/04/27 09:21:27 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2008/04/27 23:03:09 wiz Exp $
 #
 
-DISTNAME=	gnome-sharp-2.16.1
-PKGREVISION=	2
+DISTNAME=	gnome-sharp-2.20.1
 CATEGORIES=	x11
-MASTER_SITES=	http://go-mono.com/sources/gnome-sharp2/
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-sharp/2.20/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.mono-project.com/GtkSharp
@@ -20,9 +19,6 @@ PKGCONFIG_OVERRIDE+=	gconf/GConf/gconf-sharp-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	gconf/GConf.PropertyEditors/gconf-sharp-peditors-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	gnome/gnome-sharp-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	gnomevfs/gnome-vfs-sharp-2.0.pc.in
-PKGCONFIG_OVERRIDE+=	gtkhtml/gtkhtml-sharp-2.0.pc.in
-PKGCONFIG_OVERRIDE+=	rsvg/rsvg-sharp-2.0.pc.in
-PKGCONFIG_OVERRIDE+=	vte/vte-sharp-2.0.pc.in
 
 SUBST_CLASSES=		pc
 SUBST_STAGE.pc=		post-patch
@@ -30,18 +26,13 @@ SUBST_FILES.pc=		${PKGCONFIG_OVERRIDE}
 SUBST_SED.pc=		-e "s|\$${pcfiledir}/../..|@prefix@|g"
 SUBST_MESSAGE.pc=	Fixing hardcoded paths.
 
-.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../graphics/libart/buildlink3.mk"
-.include "../../graphics/librsvg/buildlink3.mk"
 .include "../../lang/mono/buildlink3.mk"
 .include "../../lang/monodoc/buildlink3.mk"
 .include "../../print/libgnomeprintui/buildlink3.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../www/gtkhtml38/buildlink3.mk"
 .include "../../x11/gnome-panel/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/gtk-sharp/buildlink3.mk"
-.include "../../x11/vte/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome-sharp/PLIST b/x11/gnome-sharp/PLIST
index 3399d67a3a7..82ba5e9301d 100644
--- a/x11/gnome-sharp/PLIST
+++ b/x11/gnome-sharp/PLIST
@@ -1,19 +1,26 @@
-@comment $NetBSD: PLIST,v 1.2 2008/02/20 18:46:27 drochner Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/04/27 23:03:09 wiz Exp $
 bin/gconfsharp2-schemagen
 lib/gtk-sharp-2.0/gconfsharp-schemagen.exe
 lib/libgnomesharpglue-2.la
-lib/libvtesharpglue-2.la
-lib/mono/gac/art-sharp/2.16.0.0__35e10195dab3c99f/art-sharp.dll
-lib/mono/gac/art-sharp/2.16.0.0__35e10195dab3c99f/art-sharp.dll.config
-lib/mono/gac/gconf-sharp-peditors/2.16.0.0__35e10195dab3c99f/gconf-sharp-peditors.dll
-lib/mono/gac/gconf-sharp/2.16.0.0__35e10195dab3c99f/gconf-sharp.dll
-lib/mono/gac/gconf-sharp/2.16.0.0__35e10195dab3c99f/gconf-sharp.dll.config
-lib/mono/gac/gnome-sharp/2.16.0.0__35e10195dab3c99f/gnome-sharp.dll
-lib/mono/gac/gnome-sharp/2.16.0.0__35e10195dab3c99f/gnome-sharp.dll.config
-lib/mono/gac/gnome-vfs-sharp/2.16.0.0__35e10195dab3c99f/gnome-vfs-sharp.dll
-lib/mono/gac/gnome-vfs-sharp/2.16.0.0__35e10195dab3c99f/gnome-vfs-sharp.dll.config
-lib/mono/gac/gtkhtml-sharp/2.16.0.0__35e10195dab3c99f/gtkhtml-sharp.dll
-lib/mono/gac/gtkhtml-sharp/2.16.0.0__35e10195dab3c99f/gtkhtml-sharp.dll.config
+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
@@ -24,12 +31,6 @@ 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.4.gtkhtml-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.config
-lib/mono/gac/policy.2.4.gtkhtml-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.gtkhtml-sharp.dll
-lib/mono/gac/policy.2.4.rsvg-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.config
-lib/mono/gac/policy.2.4.rsvg-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.rsvg-sharp.dll
-lib/mono/gac/policy.2.4.vte-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.config
-lib/mono/gac/policy.2.4.vte-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.vte-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
@@ -40,12 +41,6 @@ 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.6.gtkhtml-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.config
-lib/mono/gac/policy.2.6.gtkhtml-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.gtkhtml-sharp.dll
-lib/mono/gac/policy.2.6.rsvg-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.config
-lib/mono/gac/policy.2.6.rsvg-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.rsvg-sharp.dll
-lib/mono/gac/policy.2.6.vte-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.config
-lib/mono/gac/policy.2.6.vte-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.vte-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
@@ -56,72 +51,39 @@ 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/policy.2.8.gtkhtml-sharp/0.0.0.0__35e10195dab3c99f/policy.2.8.config
-lib/mono/gac/policy.2.8.gtkhtml-sharp/0.0.0.0__35e10195dab3c99f/policy.2.8.gtkhtml-sharp.dll
-lib/mono/gac/policy.2.8.rsvg-sharp/0.0.0.0__35e10195dab3c99f/policy.2.8.config
-lib/mono/gac/policy.2.8.rsvg-sharp/0.0.0.0__35e10195dab3c99f/policy.2.8.rsvg-sharp.dll
-lib/mono/gac/policy.2.8.vte-sharp/0.0.0.0__35e10195dab3c99f/policy.2.8.config
-lib/mono/gac/policy.2.8.vte-sharp/0.0.0.0__35e10195dab3c99f/policy.2.8.vte-sharp.dll
-lib/mono/gac/rsvg-sharp/2.16.0.0__35e10195dab3c99f/rsvg-sharp.dll
-lib/mono/gac/rsvg-sharp/2.16.0.0__35e10195dab3c99f/rsvg-sharp.dll.config
-lib/mono/gac/vte-sharp/2.16.0.0__35e10195dab3c99f/vte-sharp.dll
-lib/mono/gac/vte-sharp/2.16.0.0__35e10195dab3c99f/vte-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/gtkhtml-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.4.gtkhtml-sharp.dll
-lib/mono/gtk-sharp-2.0/policy.2.4.rsvg-sharp.dll
-lib/mono/gtk-sharp-2.0/policy.2.4.vte-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.6.gtkhtml-sharp.dll
-lib/mono/gtk-sharp-2.0/policy.2.6.rsvg-sharp.dll
-lib/mono/gtk-sharp-2.0/policy.2.6.vte-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/mono/gtk-sharp-2.0/policy.2.8.gtkhtml-sharp.dll
-lib/mono/gtk-sharp-2.0/policy.2.8.rsvg-sharp.dll
-lib/mono/gtk-sharp-2.0/policy.2.8.vte-sharp.dll
-lib/mono/gtk-sharp-2.0/rsvg-sharp.dll
-lib/mono/gtk-sharp-2.0/vte-sharp.dll
 lib/pkgconfig/art-sharp-2.0.pc
 lib/pkgconfig/gconf-sharp-2.0.pc
 lib/pkgconfig/gconf-sharp-peditors-2.0.pc
 lib/pkgconfig/gnome-sharp-2.0.pc
 lib/pkgconfig/gnome-vfs-sharp-2.0.pc
-lib/pkgconfig/gtkhtml-sharp-2.0.pc
-lib/pkgconfig/rsvg-sharp-2.0.pc
-lib/pkgconfig/vte-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
-share/gapi-2.0/gtkhtml-api.xml
-share/gapi-2.0/rsvg-api.xml
-share/gapi-2.0/vte-api.xml
-@dirrm lib/mono/gac/vte-sharp/2.16.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/vte-sharp
-@dirrm lib/mono/gac/rsvg-sharp/2.16.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/rsvg-sharp
-@dirrm lib/mono/gac/policy.2.8.vte-sharp/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.8.vte-sharp
-@dirrm lib/mono/gac/policy.2.8.rsvg-sharp/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.8.rsvg-sharp
-@dirrm lib/mono/gac/policy.2.8.gtkhtml-sharp/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.8.gtkhtml-sharp
 @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
@@ -132,12 +94,6 @@ share/gapi-2.0/vte-api.xml
 @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.vte-sharp/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.6.vte-sharp
-@dirrm lib/mono/gac/policy.2.6.rsvg-sharp/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.6.rsvg-sharp
-@dirrm lib/mono/gac/policy.2.6.gtkhtml-sharp/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.6.gtkhtml-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
@@ -148,12 +104,6 @@ share/gapi-2.0/vte-api.xml
 @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.vte-sharp/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.4.vte-sharp
-@dirrm lib/mono/gac/policy.2.4.rsvg-sharp/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.4.rsvg-sharp
-@dirrm lib/mono/gac/policy.2.4.gtkhtml-sharp/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.4.gtkhtml-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
@@ -164,15 +114,23 @@ share/gapi-2.0/vte-api.xml
 @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/gtkhtml-sharp/2.16.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/gtkhtml-sharp
-@dirrm lib/mono/gac/gnome-vfs-sharp/2.16.0.0__35e10195dab3c99f
+@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
 @dirrm lib/mono/gac/gnome-vfs-sharp
-@dirrm lib/mono/gac/gnome-sharp/2.16.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gnome-sharp/2.20.0.0__35e10195dab3c99f
 @dirrm lib/mono/gac/gnome-sharp
-@dirrm lib/mono/gac/gconf-sharp/2.16.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/gconf-sharp-peditors/2.16.0.0__35e10195dab3c99f
+@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-peditors
 @dirrm lib/mono/gac/gconf-sharp
-@dirrm lib/mono/gac/art-sharp/2.16.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/art-sharp/2.20.0.0__35e10195dab3c99f
 @dirrm lib/mono/gac/art-sharp
diff --git a/x11/gnome-sharp/buildlink3.mk b/x11/gnome-sharp/buildlink3.mk
index a3d1c2df5f4..8174a16f901 100644
--- a/x11/gnome-sharp/buildlink3.mk
+++ b/x11/gnome-sharp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2008/03/17 22:54:02 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2008/04/27 23:03:09 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_SHARP_BUILDLINK3_MK:=	${GNOME_SHARP_BUILDLINK3_MK}+
@@ -14,22 +14,17 @@ BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-sharp
 .if ${GNOME_SHARP_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.gnome-sharp+=	gnome-sharp>=2.16.1
 BUILDLINK_ABI_DEPENDS.gnome-sharp?=	gnome-sharp>=2.16.1nb1
-BUILDLINK_PKGSRCDIR.gnome-sharp?=	../../x11/gnome-sharp
+BUILDLINK_PKGSRCDIR.gnome-sharp?=	../../zzz/gnome-sharp
 .endif	# GNOME_SHARP_BUILDLINK3_MK
 
-.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../graphics/libart/buildlink3.mk"
-.include "../../graphics/librsvg/buildlink3.mk"
 .include "../../lang/mono/buildlink3.mk"
 .include "../../lang/monodoc/buildlink3.mk"
 .include "../../print/libgnomeprintui/buildlink3.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../www/gtkhtml38/buildlink3.mk"
 .include "../../x11/gnome-panel/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/gtk-sharp/buildlink3.mk"
-.include "../../x11/vte/buildlink3.mk"
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/gnome-sharp/distinfo b/x11/gnome-sharp/distinfo
index 15b036c55fd..a5510f7f898 100644
--- a/x11/gnome-sharp/distinfo
+++ b/x11/gnome-sharp/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/02/19 13:48:13 xtraeme Exp $
+$NetBSD: distinfo,v 1.2 2008/04/27 23:03:09 wiz Exp $
 
-SHA1 (gnome-sharp-2.16.1.tar.gz) = 1a408313672158466018cc9b0155f3801036d138
-RMD160 (gnome-sharp-2.16.1.tar.gz) = 87d0f2bb269e57a105802d9e4b9d0537c50f122c
-Size (gnome-sharp-2.16.1.tar.gz) = 653880 bytes
+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