Update to 2.15.93.

This package now requires guile-cairo, which isn't pckaged, and thus
cairo/gtk2+ wrapping is broken.  The old package failed to build
anyway, so this seems like an improvement.

guile-gnome-pkg 2.15.93 - Andy Wingo, 2007-06-15
================================================

* No user-visible changes.


guile-gnome-pkg 2.15.92 - Andy Wingo, 2007-05-24
================================================

* Updates to h2defs.py to automatically handle more cases.

* Add cairo to guile-gnome-platform.


guile-gnome-pkg 2.15.91 - Andy Wingo, 2007-05-10
================================================

* Require G-Wrap 1.9.8.


guile-gnome-pkg 2.15.90 - Andy Wingo, 2006-12-15
================================================

* Require G-Wrap 1.9.7.

* Update to use bzr as the version control system, instead of tla.

6 files changed, 55 insertions, 66 deletions

diff --git a/devel/guile-gnome/Makefile b/devel/guile-gnome/Makefile
index ef59eb19e8f..81524a34114 100644
--- a/devel/guile-gnome/Makefile
+++ b/devel/guile-gnome/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2007/06/05 05:37:24 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2007/08/10 21:10:34 gdt Exp $
 
-DISTNAME=	guile-gnome-platform-2.7.99
-PKGREVISION=	4
+DISTNAME=	guile-gnome-platform-2.15.93
 CATEGORIES=	devel
 MASTER_SITES=	http://ftp.gnu.org/gnu/guile-gnome/guile-gnome-platform/
 
@@ -11,13 +10,28 @@ COMMENT=	Library to access gobject/glib/gtk and gnome from guile
 
 DEPENDS+=	guile-slib>=2.4.2:../../devel/guile-slib
 
+MAKE_JOBS_SAFE=		NO
+
 GNU_CONFIGURE=		YES
 USE_TOOLS+=		gmake makeinfo pkg-config
 USE_LIBTOOL=		YES
 INFO_FILES=		# PLIST
 
+# XXX This should arguably be split into separate packages.
+
+.include "../../devel/atk/buildlink3.mk"
 .include "../../devel/g-wrap/buildlink3.mk"
-# XXX split into separate packages
+.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/libbonobo/buildlink3.mk"
+.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
+.include "../../devel/pango/buildlink3.mk"
+.include "../../graphics/libgnomecanvas/buildlink3.mk"
+.include "../../lang/guile/buildlink3.mk"
+.include "../../net/ORBit2/buildlink3.mk"
+.include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/guile-gnome/PLIST b/devel/guile-gnome/PLIST
index 89e75216ae6..6a9fde90cd5 100644
--- a/devel/guile-gnome/PLIST
+++ b/devel/guile-gnome/PLIST
@@ -1,26 +1,28 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/09/13 16:53:05 gdt Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/08/10 21:10:34 gdt Exp $
 bin/guile-gnome-0
 include/guile-gnome-0/guile-gnome-corba/guile-gnome-corba-generic.h
 include/guile-gnome-0/guile-gnome-corba/guile-gnome-corba-primitives.h
 include/guile-gnome-0/guile-gnome-corba/guile-gnome-corba-types.h
 include/guile-gnome-0/guile-gnome-corba/guile-gnome-corba.h
 include/guile-gnome-0/guile-gnome-gobject.h
+include/guile-gnome-0/guile-gnome-gobject/gc.h
 include/guile-gnome-0/guile-gnome-gobject/gclosure.h
 include/guile-gnome-0/guile-gnome-gobject/gobject.h
 include/guile-gnome-0/guile-gnome-gobject/gparameter.h
 include/guile-gnome-0/guile-gnome-gobject/gsignal.h
 include/guile-gnome-0/guile-gnome-gobject/gtype.h
+include/guile-gnome-0/guile-gnome-gobject/gutil.h
 include/guile-gnome-0/guile-gnome-gobject/gvalue.h
 info/guile-gnome-tutorial.info
 lib/guile-gnome-0/libgw-guile-gnome-atk.la
 lib/guile-gnome-0/libgw-guile-gnome-canvas.la
 lib/guile-gnome-0/libgw-guile-gnome-corba.la
 lib/guile-gnome-0/libgw-guile-gnome-gconf.la
-lib/guile-gnome-0/libgw-guile-gnome-gdk.la
+@comment lib/guile-gnome-0/libgw-guile-gnome-gdk.la
 lib/guile-gnome-0/libgw-guile-gnome-glib.la
 lib/guile-gnome-0/libgw-guile-gnome-gnome-vfs.la
 lib/guile-gnome-0/libgw-guile-gnome-gobject.la
-lib/guile-gnome-0/libgw-guile-gnome-gtk.la
+@comment lib/guile-gnome-0/libgw-guile-gnome-gtk.la
 lib/guile-gnome-0/libgw-guile-gnome-libglade.la
 lib/guile-gnome-0/libgw-guile-gnome-libgnome.la
 lib/guile-gnome-0/libgw-guile-gnome-libgnomeui.la
@@ -30,7 +32,7 @@ lib/libguile-gnome-gobject-0.la
 lib/orbit-2.0/Foo_module.la
 lib/pkgconfig/guile-gnome-defs-0.pc
 lib/pkgconfig/guile-gnome-glib-0.pc
-lib/pkgconfig/guile-gnome-gtk-0.pc
+@comment lib/pkgconfig/guile-gnome-gtk-0.pc
 lib/pkgconfig/guile-gnome-libgnomeui-0.pc
 share/guile-gnome-0/gnome/atk.scm
 share/guile-gnome-0/gnome/canvas.scm
@@ -60,7 +62,7 @@ share/guile-gnome-0/gnome/defs/glib-types.defs
 share/guile-gnome-0/gnome/defs/glib.defs
 share/guile-gnome-0/gnome/defs/gnome-vfs-types.defs
 share/guile-gnome-0/gnome/defs/gnome-vfs.defs
-share/guile-gnome-0/gnome/defs/gnome.defs
+@comment share/guile-gnome-0/gnome/defs/gnome.defs
 share/guile-gnome-0/gnome/defs/gtk-extrafuncs.defs
 share/guile-gnome-0/gnome/defs/gtk-types.defs
 share/guile-gnome-0/gnome/defs/gtk.defs
@@ -70,18 +72,23 @@ share/guile-gnome-0/gnome/defs/gtksourceview.defs
 share/guile-gnome-0/gnome/defs/libgda-overrides.defs
 share/guile-gnome-0/gnome/defs/libgda-types.defs
 share/guile-gnome-0/gnome/defs/libgda.defs
+share/guile-gnome-0/gnome/defs/libglade-types.defs
 share/guile-gnome-0/gnome/defs/libglade.defs
+share/guile-gnome-0/gnome/defs/libgnome-types.defs
+share/guile-gnome-0/gnome/defs/libgnome.defs
 share/guile-gnome-0/gnome/defs/libgnomecanvas-types.defs
 share/guile-gnome-0/gnome/defs/libgnomecanvas.defs
+share/guile-gnome-0/gnome/defs/libgnomeui-types.defs
+share/guile-gnome-0/gnome/defs/libgnomeui.defs
 share/guile-gnome-0/gnome/defs/libwnck-types.defs
 share/guile-gnome-0/gnome/defs/libwnck.defs
 share/guile-gnome-0/gnome/defs/nautilus.defs
 share/guile-gnome-0/gnome/defs/pango-types.defs
 share/guile-gnome-0/gnome/defs/pango.defs
+share/guile-gnome-0/gnome/defs/pangocairo-types.defs
+share/guile-gnome-0/gnome/defs/pangocairo.defs
 share/guile-gnome-0/gnome/defs/print.defs
 share/guile-gnome-0/gnome/defs/printui.defs
-share/guile-gnome-0/gnome/defs/ui-types.defs
-share/guile-gnome-0/gnome/defs/ui.defs
 share/guile-gnome-0/gnome/defs/vte-overrides.defs
 share/guile-gnome-0/gnome/defs/vte.defs
 share/guile-gnome-0/gnome/gconf.scm
@@ -103,7 +110,7 @@ share/guile-gnome-0/gnome/gobject/gvalue.scm
 share/guile-gnome-0/gnome/gobject/gw-spec-utils.scm
 share/guile-gnome-0/gnome/gobject/gw-utils.scm
 share/guile-gnome-0/gnome/gobject/utils.scm
-share/guile-gnome-0/gnome/gtk.scm
+@comment share/guile-gnome-0/gnome/gtk.scm
 share/guile-gnome-0/gnome/gtk/gdk-event.scm
 share/guile-gnome-0/gnome/gtk/graphical-repl.scm
 share/guile-gnome-0/gnome/gw/atk-spec.scm
@@ -114,16 +121,17 @@ share/guile-gnome-0/gnome/gw/corba-spec.scm
 share/guile-gnome-0/gnome/gw/corba.scm
 share/guile-gnome-0/gnome/gw/gconf-spec.scm
 share/guile-gnome-0/gnome/gw/gconf.scm
-share/guile-gnome-0/gnome/gw/gdk-spec.scm
-share/guile-gnome-0/gnome/gw/gdk.scm
+@comment share/guile-gnome-0/gnome/gw/gdk-spec.scm
+@comment share/guile-gnome-0/gnome/gw/gdk.scm
+share/guile-gnome-0/gnome/gw/generics.scm
 share/guile-gnome-0/gnome/gw/glib-spec.scm
 share/guile-gnome-0/gnome/gw/glib.scm
 share/guile-gnome-0/gnome/gw/gnome-vfs-spec.scm
 share/guile-gnome-0/gnome/gw/gnome-vfs.scm
 share/guile-gnome-0/gnome/gw/gobject-spec.scm
 share/guile-gnome-0/gnome/gw/gobject.scm
-share/guile-gnome-0/gnome/gw/gtk-spec.scm
-share/guile-gnome-0/gnome/gw/gtk.scm
+@comment share/guile-gnome-0/gnome/gw/gtk-spec.scm
+@comment share/guile-gnome-0/gnome/gw/gtk.scm
 share/guile-gnome-0/gnome/gw/libglade-spec.scm
 share/guile-gnome-0/gnome/gw/libglade.scm
 share/guile-gnome-0/gnome/gw/libgnome-spec.scm
@@ -133,24 +141,33 @@ share/guile-gnome-0/gnome/gw/libgnomeui.scm
 share/guile-gnome-0/gnome/gw/pango-spec.scm
 share/guile-gnome-0/gnome/gw/pango.scm
 share/guile-gnome-0/gnome/gw/support/defs.scm
+share/guile-gnome-0/gnome/gw/support/g-wrap.scm
+share/guile-gnome-0/gnome/gw/support/genwrite.scm
+share/guile-gnome-0/gnome/gw/support/glob.scm
 share/guile-gnome-0/gnome/gw/support/gobject.scm
 share/guile-gnome-0/gnome/gw/support/modules.scm
+share/guile-gnome-0/gnome/gw/support/printf.scm
+share/guile-gnome-0/gnome/gw/support/slib.scm
+share/guile-gnome-0/gnome/overrides/atk.defs
 share/guile-gnome-0/gnome/overrides/gconf.defs
 share/guile-gnome-0/gnome/overrides/gconf.defs-type-ignores
 share/guile-gnome-0/gnome/overrides/gdk-pixbuf.defs
 share/guile-gnome-0/gnome/overrides/gdk.defs
-share/guile-gnome-0/gnome/overrides/gdk.defs-type-overrides
+share/guile-gnome-0/gnome/overrides/gdk.defs-type-ignores
 share/guile-gnome-0/gnome/overrides/glib.defs
+share/guile-gnome-0/gnome/overrides/glib.defs-type-ignores
 share/guile-gnome-0/gnome/overrides/gnome-vfs.defs
 share/guile-gnome-0/gnome/overrides/gnome-vfs.defs-type-ignores
-share/guile-gnome-0/gnome/overrides/gnome.defs
 share/guile-gnome-0/gnome/overrides/gtk-customs.defs
 share/guile-gnome-0/gnome/overrides/gtk.defs
 share/guile-gnome-0/gnome/overrides/gtk.defs-type-ignores
 share/guile-gnome-0/gnome/overrides/libglade.defs
+share/guile-gnome-0/gnome/overrides/libgnome.defs
 share/guile-gnome-0/gnome/overrides/libgnomecanvas.defs
-share/guile-gnome-0/gnome/overrides/ui.defs
-share/guile-gnome-0/gnome/overrides/ui.defs-type-ignores
+share/guile-gnome-0/gnome/overrides/libgnomeui.defs
+share/guile-gnome-0/gnome/overrides/libgnomeui.defs-type-ignores
+share/guile-gnome-0/gnome/overrides/pango.defs
+share/guile-gnome-0/gnome/overrides/pangocairo.defs
 share/guile-gnome-0/gnome/pango.scm
 share/guile-gnome-0/gnome/vfs.scm
 share/guile/site/gnome-0.scm
diff --git a/devel/guile-gnome/distinfo b/devel/guile-gnome/distinfo
index 56327f6519b..976dfe5553b 100644
--- a/devel/guile-gnome/distinfo
+++ b/devel/guile-gnome/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/09/13 16:53:05 gdt Exp $
+$NetBSD: distinfo,v 1.2 2007/08/10 21:10:35 gdt Exp $
 
-SHA1 (guile-gnome-platform-2.7.99.tar.gz) = 942f32a4d654199f4b4731861b1139fca0f5c4b4
-RMD160 (guile-gnome-platform-2.7.99.tar.gz) = 5aae8870ec03f011b265e2ced84830c40079bf3a
-Size (guile-gnome-platform-2.7.99.tar.gz) = 1058284 bytes
-SHA1 (patch-aa) = 05a6a9fe46871899343519cc08b58ae9e52c4744
-SHA1 (patch-ab) = 19afeb15658bed83af2334b78112411652e14bbb
-SHA1 (patch-ac) = 40578b596ca318974bfa312a21585072e9a08457
+SHA1 (guile-gnome-platform-2.15.93.tar.gz) = 1ebd8b54e12a53d3eb95f2c754cc460f693a666c
+RMD160 (guile-gnome-platform-2.15.93.tar.gz) = 0370ce257add4de493878c0692ee6b7b08c8550f
+Size (guile-gnome-platform-2.15.93.tar.gz) = 1179732 bytes
diff --git a/devel/guile-gnome/patches/patch-aa b/devel/guile-gnome/patches/patch-aa
deleted file mode 100644
index d391ecbb9c4..00000000000
--- a/devel/guile-gnome/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/09/13 16:53:05 gdt Exp $
-
---- glib/gnome/gobject/gtype.c.orig	2005-01-24 06:52:56.000000000 -0500
-+++ glib/gnome/gobject/gtype.c
-@@ -265,7 +265,7 @@ SCM_DEFINE (scm_gtype_interfaces, "gtype
- #define FUNC_NAME s_scm_gtype_interfaces
- {
-     GType gtype, *interfaces;
--    gint n_interfaces, i;
-+    guint n_interfaces, i;
-     SCM ret = SCM_EOL;
- 
-     SCM_VALIDATE_GTYPE_COPY (1, type, gtype);
diff --git a/devel/guile-gnome/patches/patch-ab b/devel/guile-gnome/patches/patch-ab
deleted file mode 100644
index 732a77309f6..00000000000
--- a/devel/guile-gnome/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/09/13 16:53:05 gdt Exp $
-
---- gnome-vfs/gnome/gw/gnome-vfs-port.c.orig	2005-01-24 06:52:57.000000000 -0500
-+++ gnome-vfs/gnome/gw/gnome-vfs-port.c
-@@ -219,7 +219,7 @@ vport_fill_input (SCM port)
- static off_t
- vport_seek (SCM port, off_t offset, int whence)
- {
--    GnomeVFSFileOffset count;
-+    GnomeVFSFileSize count;
-     GnomeVFSResult res;
-     scm_t_port *pt = SCM_PTAB_ENTRY (port);
-     GnomeVFSHandle *handle = (GnomeVFSHandle*)SCM_STREAM (port);
diff --git a/devel/guile-gnome/patches/patch-ac b/devel/guile-gnome/patches/patch-ac
deleted file mode 100644
index 89acbbc6f96..00000000000
--- a/devel/guile-gnome/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2006/09/13 16:53:05 gdt Exp $
-
---- gtk/gnome/gw/gtk-support.c.orig	2005-01-24 06:52:58.000000000 -0500
-+++ gtk/gnome/gw/gtk-support.c
-@@ -423,7 +423,7 @@ _wrap_gtk_message_dialog_new (GtkWindow*
- gchar*
- _gtk_selection_data_get_as_string (GtkSelectionData *data) 
- {
--    return g_strndup (data->data, data->length);
-+    return g_strndup ((const char *)data->data, data->length);
- }
- 
- void