Update to 2.24.0:

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

	* gnomedesktop/gnomedesktop-sharp.dll.config.in: fix so version.
	* gnomepanel/gnome-panel-sharp.dll.config.in: add missing dllmap.
	Fixes for 420142 and 420145 from Goetz Waschk.

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

	* configure.in: update gtk-sharp requirement to 2.12.1 since the
	gnomepanel glue generation doesn't occur using 2.12.0.  This breaks
	the build since it's expecting a generated.c to be present.
	[Fixes #418291]

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

	* *: Update to GNOME 2.23.5 API.  Add gnome-print-sharp.dll
	and gnome-panel-sharp.dll assemblies, along with .pcs to detect
	their availability.

4 files changed, 56 insertions, 26 deletions

diff --git a/x11/gnome-desktop-sharp/Makefile b/x11/gnome-desktop-sharp/Makefile
index 21ccc795da7..7654dee492f 100644
--- a/x11/gnome-desktop-sharp/Makefile
+++ b/x11/gnome-desktop-sharp/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2008/09/06 20:54:34 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2008/10/24 20:59:54 wiz Exp $
 #
 
-DISTNAME=	gnome-desktop-sharp-2.20.1
-PKGREVISION=	1
+DISTNAME=	gnome-desktop-sharp-2.24.0
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-desktop-sharp/2.20/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-desktop-sharp/2.24/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.mono-project.com/GtkSharp
@@ -18,6 +17,8 @@ USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake pkg-config
 
 PKGCONFIG_OVERRIDE+=	gnomedesktop/gnome-desktop-sharp-2.0.pc.in
+PKGCONFIG_OVERRIDE+=	gnomepanel/gnome-panel-sharp-2.24.pc.in
+PKGCONFIG_OVERRIDE+=	gnomeprint/gnome-print-sharp-2.18.pc.in
 PKGCONFIG_OVERRIDE+=	gtkhtml/gtkhtml-sharp-3.14.pc.in
 PKGCONFIG_OVERRIDE+=	gtksourceview/gtksourceview2-sharp.pc.in
 PKGCONFIG_OVERRIDE+=	nautilusburn/nautilusburn-sharp.pc.in
@@ -31,21 +32,26 @@ SUBST_FILES.pc=		${PKGCONFIG_OVERRIDE}
 SUBST_SED.pc=		-e "s|\$${pcfiledir}/../..|@prefix@|g"
 SUBST_MESSAGE.pc=	Fixing hardcoded paths.
 
-.include "../../lang/mono/buildlink3.mk"
-.include "../../lang/monodoc/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libwnck+=		libwnck>=2.23.0
 .include "../../devel/libwnck/buildlink3.mk"
-BUILDLINK_API_DEPENDS.librsvg+=		librsvg>=2.18.2
+BUILDLINK_API_DEPENDS.librsvg+=		librsvg>=2.22.2
 .include "../../graphics/librsvg/buildlink3.mk"
-# XXX: needs >=2.20.0, not yet in pkgsrc
-#BUILDLINK_API_DEPENDS.nautilus-cd-burner+=	nautilus-cd-burner>=2.20.0
+BUILDLINK_API_DEPENDS.libgnomeprint+=	libgnomeprint>=2.18.0
+.include "../../print/libgnomeprint/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libgnomeprintui+=	libgnomeprintui>=2.18.0
+.include "../../print/libgnomeprintui/buildlink3.mk"
+# XXX: needs 2.22.1 of libnautilus-burn, not yet in pkgsrc
+#BUILDLINK_API_DEPENDS.nautilus-cd-burner+=	nautilus-cd-burner>=2.22.1
 #.include "../../sysutils/nautilus-cd-burner/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gtkhtml314+=	gtkhtml314>=3.16.0
+BUILDLINK_API_DEPENDS.gtkhtml314+=	gtkhtml314>=3.23.5
 .include "../../www/gtkhtml314/buildlink3.mk"
-BUILDLINK_API_DEPENDS.vte+=	vte>=0.16.9
-.include "../../x11/vte/buildlink3.mk"
-.include "../../x11/gnome-desktop/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gnome-sharp+=	gnome-sharp>=2.20.0
+BUILDLINK_API_DEPENDS.gnome-panel+=	gnome-panel>=2.23.0
+.include "../../x11/gnome-panel/buildlink3.mk"
 .include "../../x11/gnome-sharp/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gtk-sharp+=	gtk-sharp>=2.12.2
 .include "../../x11/gtk-sharp/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gtksourceview2+=	gtksourceview2>=2.2.2
 .include "../../x11/gtksourceview2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.vte+=		vte>=0.16.14
+.include "../../x11/vte/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome-desktop-sharp/PLIST b/x11/gnome-desktop-sharp/PLIST
index f33ed4c635d..8e5e11da7e3 100644
--- a/x11/gnome-desktop-sharp/PLIST
+++ b/x11/gnome-desktop-sharp/PLIST
@@ -1,5 +1,13 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/04/27 23:12:54 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/10/24 20:59:54 wiz Exp $
+lib/libgnomepanelsharpglue-2.la
+lib/libgtkhtmlsharpglue-2.la
+lib/libgtksourceview2sharpglue-2.la
 lib/libvtesharpglue-2.la
+lib/libwncksharpglue-2.la
+lib/mono/gac/gnome-panel-sharp/2.24.0.0__35e10195dab3c99f/gnome-panel-sharp.dll
+lib/mono/gac/gnome-panel-sharp/2.24.0.0__35e10195dab3c99f/gnome-panel-sharp.dll.config
+lib/mono/gac/gnome-print-sharp/2.18.0.0__35e10195dab3c99f/gnome-print-sharp.dll
+lib/mono/gac/gnome-print-sharp/2.18.0.0__35e10195dab3c99f/gnome-print-sharp.dll.config
 lib/mono/gac/gnomedesktop-sharp/2.20.0.0__35e10195dab3c99f/gnomedesktop-sharp.dll
 lib/mono/gac/gnomedesktop-sharp/2.20.0.0__35e10195dab3c99f/gnomedesktop-sharp.dll.config
 lib/mono/gac/gtkhtml-sharp/3.16.0.0__35e10195dab3c99f/gtkhtml-sharp.dll
@@ -12,6 +20,8 @@ lib/mono/gac/vte-sharp/0.16.0.0__35e10195dab3c99f/vte-sharp.dll
 lib/mono/gac/vte-sharp/0.16.0.0__35e10195dab3c99f/vte-sharp.dll.config
 lib/mono/gac/wnck-sharp/2.20.0.0__35e10195dab3c99f/wnck-sharp.dll
 lib/mono/gac/wnck-sharp/2.20.0.0__35e10195dab3c99f/wnck-sharp.dll.config
+lib/mono/gnome-panel-sharp-2.24/gnome-panel-sharp.dll
+lib/mono/gnome-print-sharp-2.18/gnome-print-sharp.dll
 lib/mono/gnomedesktop-sharp-2.20/gnomedesktop-sharp.dll
 lib/mono/gtkhtml-sharp-3.14/gtkhtml-sharp.dll
 lib/mono/gtksourceview2-sharp-2.0/gtksourceview2-sharp.dll
@@ -19,11 +29,15 @@ lib/mono/rsvg2-sharp-2.0/rsvg2-sharp.dll
 lib/mono/vte-sharp-0.16/vte-sharp.dll
 lib/mono/wnck-sharp-2.20/wnck-sharp.dll
 lib/pkgconfig/gnome-desktop-sharp-2.0.pc
+lib/pkgconfig/gnome-panel-sharp-2.24.pc
+lib/pkgconfig/gnome-print-sharp-2.18.pc
 lib/pkgconfig/gtkhtml-sharp-3.14.pc
 lib/pkgconfig/gtksourceview2-sharp.pc
 lib/pkgconfig/rsvg2-sharp-2.0.pc
 lib/pkgconfig/vte-sharp-0.16.pc
 lib/pkgconfig/wnck-sharp-1.0.pc
+share/gnome-panel-sharp/2.24/gnome-panel-api.xml
+share/gnome-print-sharp/2.18/gnome-print-api.xml
 share/gnomedesktop-sharp/2.20/gnomedesktop-api.xml
 share/gtkhtml-sharp/3.14/gtkhtml-api.xml
 share/gtksourceview2-sharp/2.0/gtksourceview2-api.xml
@@ -42,12 +56,18 @@ share/wnck-sharp/2.20/wnck-api.xml
 @dirrm share/gtkhtml-sharp
 @dirrm share/gnomedesktop-sharp/2.20
 @dirrm share/gnomedesktop-sharp
+@dirrm share/gnome-print-sharp/2.18
+@dirrm share/gnome-print-sharp
+@dirrm share/gnome-panel-sharp/2.24
+@dirrm share/gnome-panel-sharp
 @dirrm lib/mono/wnck-sharp-2.20
 @dirrm lib/mono/vte-sharp-0.16
 @dirrm lib/mono/rsvg2-sharp-2.0
 @dirrm lib/mono/gtksourceview2-sharp-2.0
 @dirrm lib/mono/gtkhtml-sharp-3.14
 @dirrm lib/mono/gnomedesktop-sharp-2.20
+@dirrm lib/mono/gnome-print-sharp-2.18
+@dirrm lib/mono/gnome-panel-sharp-2.24
 @dirrm lib/mono/gac/wnck-sharp/2.20.0.0__35e10195dab3c99f
 @dirrm lib/mono/gac/wnck-sharp
 @dirrm lib/mono/gac/vte-sharp/0.16.0.0__35e10195dab3c99f
@@ -60,3 +80,8 @@ share/wnck-sharp/2.20/wnck-api.xml
 @dirrm lib/mono/gac/gtkhtml-sharp
 @dirrm lib/mono/gac/gnomedesktop-sharp/2.20.0.0__35e10195dab3c99f
 @dirrm lib/mono/gac/gnomedesktop-sharp
+@dirrm lib/mono/gac/gnome-print-sharp/2.18.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gnome-print-sharp
+@dirrm lib/mono/gac/gnome-panel-sharp/2.24.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gnome-panel-sharp
+@comment in mono: @dirrm lib/mono/gac
diff --git a/x11/gnome-desktop-sharp/buildlink3.mk b/x11/gnome-desktop-sharp/buildlink3.mk
index 55f4c2f2aac..617d953cd27 100644
--- a/x11/gnome-desktop-sharp/buildlink3.mk
+++ b/x11/gnome-desktop-sharp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/09/06 20:54:34 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2008/10/24 20:59:54 wiz Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 GNOME_DESKTOP_SHARP_BUILDLINK3_MK:=	${GNOME_DESKTOP_SHARP_BUILDLINK3_MK}+
@@ -12,20 +12,19 @@ BUILDLINK_PACKAGES+=	gnome-desktop-sharp
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-desktop-sharp
 
 .if ${GNOME_DESKTOP_SHARP_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.gnome-desktop-sharp+=	gnome-desktop-sharp>=2.20.1
-BUILDLINK_ABI_DEPENDS.gnome-desktop-sharp?=	gnome-desktop-sharp>=2.20.1nb1
+BUILDLINK_API_DEPENDS.gnome-desktop-sharp+=	gnome-desktop-sharp>=2.24.0
 BUILDLINK_PKGSRCDIR.gnome-desktop-sharp?=	../../x11/gnome-desktop-sharp
 .endif	# GNOME_DESKTOP_SHARP_BUILDLINK3_MK
 
-.include "../../lang/mono/buildlink3.mk"
-.include "../../lang/monodoc/buildlink3.mk"
 .include "../../devel/libwnck/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
+.include "../../print/libgnomeprint/buildlink3.mk"
+.include "../../print/libgnomeprintui/buildlink3.mk"
 .include "../../www/gtkhtml314/buildlink3.mk"
-.include "../../x11/vte/buildlink3.mk"
-.include "../../x11/gnome-desktop/buildlink3.mk"
+.include "../../x11/gnome-panel/buildlink3.mk"
 .include "../../x11/gnome-sharp/buildlink3.mk"
 .include "../../x11/gtk-sharp/buildlink3.mk"
 .include "../../x11/gtksourceview2/buildlink3.mk"
+.include "../../x11/vte/buildlink3.mk"
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/gnome-desktop-sharp/distinfo b/x11/gnome-desktop-sharp/distinfo
index 207ab076223..42916a13b0f 100644
--- a/x11/gnome-desktop-sharp/distinfo
+++ b/x11/gnome-desktop-sharp/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/04/27 23:12:54 wiz Exp $
+$NetBSD: distinfo,v 1.2 2008/10/24 20:59:54 wiz Exp $
 
-SHA1 (gnome-desktop-sharp-2.20.1.tar.gz) = 8768382cfe50eba524564cbc77af683926a9804a
-RMD160 (gnome-desktop-sharp-2.20.1.tar.gz) = 9946df3c7ec213164128d0fff3fd3cc6f12a1436
-Size (gnome-desktop-sharp-2.20.1.tar.gz) = 399714 bytes
+SHA1 (gnome-desktop-sharp-2.24.0.tar.gz) = cd37f52db9daa1fb3ba02824eeff5b626288c44e
+RMD160 (gnome-desktop-sharp-2.24.0.tar.gz) = c3bf3ae18d1a51f70e141008d3adc8478c20d8c3
+Size (gnome-desktop-sharp-2.24.0.tar.gz) = 444598 bytes