Update to ruby-gnome2-gtk to 0.17.0rc1 to build with newer gnome packages.

5 files changed, 8 insertions, 45 deletions

diff --git a/x11/ruby-gnome2-gtk/Makefile b/x11/ruby-gnome2-gtk/Makefile
index 78f576484fd..8d2eedc9403 100644
--- a/x11/ruby-gnome2-gtk/Makefile
+++ b/x11/ruby-gnome2-gtk/Makefile
@@ -1,21 +1,18 @@
-# $NetBSD: Makefile,v 1.10 2007/12/17 02:59:58 obache Exp $
+# $NetBSD: Makefile,v 1.11 2008/06/19 15:15:06 taca Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-gtk-${VERSION}
-PKGREVISION=		2
-COMMENT=		Ruby binding of GTK+-2.x
 CATEGORIES=		x11
+COMMENT=		Ruby binding of GTK+-2.x
 
 CONFLICTS+=		ruby-gnome2-gtk-[0-9]*
 
-RUBY_EXTCONF_SUBDIRS=	gtk
+RUBY_EXTCONF_SUBDIRS=	glib gtk
 
-DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-glib>=${VERSION}:../../devel/ruby-gnome2-glib
 DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-atk>=${VERSION}:../../devel/ruby-gnome2-atk
 DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-gdkpixbuf>=${VERSION}:../../graphics/ruby-gnome2-gdkpixbuf
 
 USE_TOOLS+=		pkg-config
-DISTINFO_FILE?=		${.CURDIR}/distinfo
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/ruby-gnome2-pango/buildlink3.mk"
diff --git a/x11/ruby-gnome2-gtk/PLIST b/x11/ruby-gnome2-gtk/PLIST
index 37e41eeb173..eebcb54b4be 100644
--- a/x11/ruby-gnome2-gtk/PLIST
+++ b/x11/ruby-gnome2-gtk/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.5 2007/01/29 06:42:34 minskim Exp $
-${RUBY_SITELIBDIR}/gtk2.rb
-${RUBY_SITELIBDIR}/gtk2/base.rb
-${RUBY_SITEARCHLIBDIR}/gtk2.${RUBY_DLEXT}
-@dirrm ${RUBY_SITELIBDIR}/gtk2
+@comment $NetBSD: PLIST,v 1.6 2008/06/19 15:15:06 taca Exp $
+${RUBY_VENDORLIB}/gtk2.rb
+${RUBY_VENDORLIB}/gtk2/base.rb
+${RUBY_VENDORARCHLIB}/gtk2.${RUBY_DLEXT}
+@dirrm ${RUBY_VENDORLIB}/gtk2
diff --git a/x11/ruby-gnome2-gtk/distinfo b/x11/ruby-gnome2-gtk/distinfo
deleted file mode 100644
index ffffb07f92d..00000000000
--- a/x11/ruby-gnome2-gtk/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.2 2007/12/17 02:59:58 obache Exp $
-
-SHA1 (ruby-gnome2-all-0.16.0.tar.gz) = 488f6c1f139060e005f336c9c854c4dc5b3e6b7c
-RMD160 (ruby-gnome2-all-0.16.0.tar.gz) = c83c7cdcf633ad5cc213180f641a6c8f18002a9c
-Size (ruby-gnome2-all-0.16.0.tar.gz) = 1208856 bytes
-SHA1 (patch-aa) = a7f4b1c3237cabfbed84545307ff61c9614ca7f7
-SHA1 (patch-ab) = bc698907beea36c9838ef187398875fe86b13919
diff --git a/x11/ruby-gnome2-gtk/patches/patch-aa b/x11/ruby-gnome2-gtk/patches/patch-aa
deleted file mode 100644
index 2e705594cf4..00000000000
--- a/x11/ruby-gnome2-gtk/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2007/08/19 03:01:23 taca Exp $
-
---- gtk/src/rbgtk.h.orig	2006-12-29 13:17:28.000000000 +0000
-+++ gtk/src/rbgtk.h
-@@ -115,7 +115,7 @@ extern GType gtk_recent_data_get_type();
-  */
- typedef void (*rbgtkiter_set_value_func)(void *model, GtkTreeIter *iter,
-                                          gint column, GValue *value);
--extern void rbgtk_register_treeiter_set_value_func(VALUE klass, rbgtkiter_set_value_func);
-+extern void rbgtk_register_treeiter_set_value_func(GType gtype, rbgtkiter_set_value_func);
- 
- /*
-  * Gtk::SelectionData
diff --git a/x11/ruby-gnome2-gtk/patches/patch-ab b/x11/ruby-gnome2-gtk/patches/patch-ab
deleted file mode 100644
index 3d320db9f8c..00000000000
--- a/x11/ruby-gnome2-gtk/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2007/12/17 02:59:58 obache Exp $
-
---- gtk/src/rbgtkmessagedialog.c.orig	2006-12-29 13:17:28.000000000 +0000
-+++ gtk/src/rbgtkmessagedialog.c
-@@ -28,7 +28,8 @@ mdiag_initialize(argc, argv, self)
-                                RVAL2GFLAGS(flags, GTK_TYPE_DIALOG_FLAGS), 
-                                RVAL2GENUM(type, GTK_TYPE_MESSAGE_TYPE), 
-                                RVAL2GENUM(buttons, GTK_TYPE_BUTTONS_TYPE),
--                               (const gchar*)(NIL_P(message) ? "": RVAL2CSTR(message)));
-+                               "%s",
-+                               NIL_P(message) ? "": RVAL2CSTR(message));
-     RBGTK_INITIALIZE(self, w);
-     return Qnil;
- }