Update to 2.24.1:

	* bootstrap-2.24: add back the POLICY_VERSION entries. Patch from
	Scott Peterson.
	* gnome/Makefile.am: add a POLICY_VERSION variable to override
	the global setting, since gnome-sharp.dll is not compatible with
	previous versions due to the gnomeprint and gnomepanel removal.
	[Fixes #469663]

3 files changed, 122 insertions, 21 deletions

diff --git a/x11/gnome-sharp/Makefile b/x11/gnome-sharp/Makefile
index 2ea5e47ec56..239642ff126 100644
--- a/x11/gnome-sharp/Makefile
+++ b/x11/gnome-sharp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2008/10/24 20:51:11 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2009/03/06 14:30:05 wiz Exp $
 #
 
-DISTNAME=	gnome-sharp-2.24.0
+DISTNAME=	gnome-sharp-2.24.1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-sharp/2.24/}
 
diff --git a/x11/gnome-sharp/PLIST b/x11/gnome-sharp/PLIST
index 88edac2fe34..988280cb878 100644
--- a/x11/gnome-sharp/PLIST
+++ b/x11/gnome-sharp/PLIST
@@ -1,21 +1,81 @@
-@comment $NetBSD: PLIST,v 1.4 2008/10/24 20:51:11 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/03/06 14:30:05 wiz Exp $
 bin/gconfsharp2-schemagen
 lib/gtk-sharp-2.0/gconfsharp-schemagen.exe
 lib/libgnomesharpglue-2.la
-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/gac/art-sharp/2.24.0.0__35e10195dab3c99f/art-sharp.dll
+lib/mono/gac/art-sharp/2.24.0.0__35e10195dab3c99f/art-sharp.dll.config
+lib/mono/gac/gconf-sharp-peditors/2.24.0.0__35e10195dab3c99f/gconf-sharp-peditors.dll
+lib/mono/gac/gconf-sharp/2.24.0.0__35e10195dab3c99f/gconf-sharp.dll
+lib/mono/gac/gconf-sharp/2.24.0.0__35e10195dab3c99f/gconf-sharp.dll.config
+lib/mono/gac/gnome-sharp/2.24.0.0__35e10195dab3c99f/gnome-sharp.dll
+lib/mono/gac/gnome-sharp/2.24.0.0__35e10195dab3c99f/gnome-sharp.dll.config
+lib/mono/gac/gnome-vfs-sharp/2.24.0.0__35e10195dab3c99f/gnome-vfs-sharp.dll
+lib/mono/gac/gnome-vfs-sharp/2.24.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-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.20.art-sharp/0.0.0.0__35e10195dab3c99f/policy.2.20.art-sharp.dll
+lib/mono/gac/policy.2.20.art-sharp/0.0.0.0__35e10195dab3c99f/policy.2.20.config
+lib/mono/gac/policy.2.20.gconf-sharp-peditors/0.0.0.0__35e10195dab3c99f/policy.2.20.config
+lib/mono/gac/policy.2.20.gconf-sharp-peditors/0.0.0.0__35e10195dab3c99f/policy.2.20.gconf-sharp-peditors.dll
+lib/mono/gac/policy.2.20.gconf-sharp/0.0.0.0__35e10195dab3c99f/policy.2.20.config
+lib/mono/gac/policy.2.20.gconf-sharp/0.0.0.0__35e10195dab3c99f/policy.2.20.gconf-sharp.dll
+lib/mono/gac/policy.2.20.gnome-vfs-sharp/0.0.0.0__35e10195dab3c99f/policy.2.20.config
+lib/mono/gac/policy.2.20.gnome-vfs-sharp/0.0.0.0__35e10195dab3c99f/policy.2.20.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-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-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-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/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-vfs-sharp.dll
+lib/mono/gtk-sharp-2.0/policy.2.20.art-sharp.dll
+lib/mono/gtk-sharp-2.0/policy.2.20.gconf-sharp-peditors.dll
+lib/mono/gtk-sharp-2.0/policy.2.20.gconf-sharp.dll
+lib/mono/gtk-sharp-2.0/policy.2.20.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-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-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-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
@@ -26,15 +86,56 @@ share/gapi-2.0/gnome-api.xml
 share/gapi-2.0/gnome-vfs-api.xml
 @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/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.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.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.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.20.gnome-vfs-sharp/0.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/policy.2.20.gnome-vfs-sharp
+@dirrm lib/mono/gac/policy.2.20.gconf-sharp/0.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/policy.2.20.gconf-sharp-peditors/0.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/policy.2.20.gconf-sharp-peditors
+@dirrm lib/mono/gac/policy.2.20.gconf-sharp
+@dirrm lib/mono/gac/policy.2.20.art-sharp/0.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/policy.2.20.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.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.24.0.0__35e10195dab3c99f
 @dirrm lib/mono/gac/gnome-vfs-sharp
-@dirrm lib/mono/gac/gnome-sharp/${PKGVERSION}.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gnome-sharp/2.24.0.0__35e10195dab3c99f
 @dirrm lib/mono/gac/gnome-sharp
-@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/2.24.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gconf-sharp-peditors/2.24.0.0__35e10195dab3c99f
 @dirrm lib/mono/gac/gconf-sharp-peditors
 @dirrm lib/mono/gac/gconf-sharp
-@dirrm lib/mono/gac/art-sharp/${PKGVERSION}.0__35e10195dab3c99f
+@dirrm lib/mono/gac/art-sharp/2.24.0.0__35e10195dab3c99f
 @dirrm lib/mono/gac/art-sharp
 @comment in mono: @dirrm lib/mono/gac
+@comment in mono: @dirrm lib/mono
 @comment in gtk-sharp: @dirrm lib/gtk-sharp-2.0
diff --git a/x11/gnome-sharp/distinfo b/x11/gnome-sharp/distinfo
index f7d015d3ea4..40e26d7fdcd 100644
--- a/x11/gnome-sharp/distinfo
+++ b/x11/gnome-sharp/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2008/10/24 20:51:11 wiz Exp $
+$NetBSD: distinfo,v 1.4 2009/03/06 14:30:05 wiz Exp $
 
-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
+SHA1 (gnome-sharp-2.24.1.tar.gz) = deaeb62de5a404c9867a07e9cfa06abfa67b982c
+RMD160 (gnome-sharp-2.24.1.tar.gz) = ae579db486ca02d16170756ba4461b576d5e5e7d
+Size (gnome-sharp-2.24.1.tar.gz) = 595441 bytes