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

7 files changed, 7 insertions, 92 deletions

diff --git a/devel/ruby-gnome2-glib/Makefile b/devel/ruby-gnome2-glib/Makefile
index 28e3f230a9b..8157f8ae9e7 100644
--- a/devel/ruby-gnome2-glib/Makefile
+++ b/devel/ruby-gnome2-glib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2007/08/19 03:00:26 taca Exp $
+# $NetBSD: Makefile,v 1.6 2008/06/19 15:11:24 taca Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-glib-${VERSION}
@@ -10,7 +10,6 @@ CONFLICTS+=		ruby-gnome2-glib-[0-9]*
 RUBY_EXTCONF_SUBDIRS=	glib
 
 USE_TOOLS+=		pkg-config
-DISTINFO_FILE?=		${.CURDIR}/distinfo
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../meta-pkgs/ruby-gnome2/Makefile.common"
diff --git a/devel/ruby-gnome2-glib/PLIST b/devel/ruby-gnome2-glib/PLIST
index 0d82b8c44c9..f624c4b6778 100644
--- a/devel/ruby-gnome2-glib/PLIST
+++ b/devel/ruby-gnome2-glib/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2007/01/29 06:42:34 minskim Exp $
-${RUBY_SITELIBDIR}/glib-mkenums.rb
-${RUBY_SITELIBDIR}/glib2.rb
-${RUBY_SITEARCHLIBDIR}/glib2.${RUBY_DLEXT}
-${RUBY_SITELIBDIR}/mkmf-gnome2.rb
-${RUBY_SITELIBDIR}/pkg-config.rb
+@comment $NetBSD: PLIST,v 1.4 2008/06/19 15:11:24 taca Exp $
+${RUBY_VENDORLIB}/glib-mkenums.rb
+${RUBY_VENDORLIB}/glib2.rb
+${RUBY_VENDORARCHLIB}/glib2.${RUBY_DLEXT}
+${RUBY_VENDORLIB}/mkmf-gnome2.rb
+${RUBY_VENDORLIB}/pkg-config.rb
diff --git a/devel/ruby-gnome2-glib/distinfo b/devel/ruby-gnome2-glib/distinfo
deleted file mode 100644
index 6a772427e5a..00000000000
--- a/devel/ruby-gnome2-glib/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.2 2008/04/24 00:49:30 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) = c2d366bd156936838ec0a8f74ab89474f3373931
-SHA1 (patch-ab) = 513dea951b8596dafd4c0c4f58cb7614b6a68dc0
-SHA1 (patch-ac) = 28e54cb6be9dbad161379989bc815a2bc84360bb
-SHA1 (patch-ad) = 19d23bf36d61f23e876af0554011cb289c37b68a
diff --git a/devel/ruby-gnome2-glib/patches/patch-aa b/devel/ruby-gnome2-glib/patches/patch-aa
deleted file mode 100644
index f5ede479fc4..00000000000
--- a/devel/ruby-gnome2-glib/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2007/08/19 03:00:27 taca Exp $
-
---- glib/src/rbgobj_boxed.c.orig	2006-12-29 22:17:28.000000000 +0900
-+++ glib/src/rbgobj_boxed.c
-@@ -145,7 +145,8 @@ rbgobj_boxed_initialize(obj, boxed)
- 
- gpointer
- rbgobj_boxed_get(obj, gtype)
--    VALUE obj, gtype;
-+    VALUE obj;
-+    GType gtype;
- {
-     boxed_holder* holder;
-     Data_Get_Struct(obj, boxed_holder, holder);
diff --git a/devel/ruby-gnome2-glib/patches/patch-ab b/devel/ruby-gnome2-glib/patches/patch-ab
deleted file mode 100644
index 0aa71fb22fe..00000000000
--- a/devel/ruby-gnome2-glib/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2007/08/19 03:00:27 taca Exp $
-
---- glib/src/rbglib_maincontext.c.orig	2006-12-29 13:17:28.000000000 +0000
-+++ glib/src/rbglib_maincontext.c
-@@ -343,7 +343,7 @@ timeout_add_seconds(VALUE self, VALUE in
-     info->callback = func;
-     id = g_timeout_add_seconds(NUM2UINT(interval),
-                                (GSourceFunc)invoke_source_func,
--                               (gpointer)info, g_free);
-+                               (gpointer)info);
-     info->id = id;
-     rb_id = UINT2NUM(id);
-     G_RELATIVE2(mGLibSource, func, id__callbacks__, rb_id);
diff --git a/devel/ruby-gnome2-glib/patches/patch-ac b/devel/ruby-gnome2-glib/patches/patch-ac
deleted file mode 100644
index 7c61440a025..00000000000
--- a/devel/ruby-gnome2-glib/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2007/08/19 03:00:28 taca Exp $
-
---- glib/src/rbglib_unicode.c.orig	2006-12-29 13:17:28.000000000 +0000
-+++ glib/src/rbglib_unicode.c
-@@ -140,7 +140,7 @@ static VALUE
- rbglib_m_unichar_get_script(VALUE self, VALUE unichar)
- {
-     return GENUM2RVAL(g_unichar_get_script(NUM2UINT(unichar)),
--                      G_TYPE_UNICODE_SCRIPT_TYPE);
-+                      G_TYPE_UNICODE_SCRIPT);
- }
- #endif
- 
diff --git a/devel/ruby-gnome2-glib/patches/patch-ad b/devel/ruby-gnome2-glib/patches/patch-ad
deleted file mode 100644
index f90109c7432..00000000000
--- a/devel/ruby-gnome2-glib/patches/patch-ad
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2008/04/24 00:49:30 obache Exp $
-
-Fixes build problem with glib 2.16
-Taken from upstream SVN repository rev 2848.
-
---- glib/src/lib/glib-mkenums.rb.orig	2006-12-29 13:17:28.000000000 +0000
-+++ glib/src/lib/glib-mkenums.rb
-@@ -3,7 +3,7 @@
- #
- # C language enum description generation library like as glib-mkenums tool.
- #
--# Copyright(C) 2006 Ruby-GNOME2 Project.
-+# Copyright(C) 2006-2008 Ruby-GNOME2 Project.
- #
- # This program is licenced under the same license of Ruby-GNOME2.
- #
-@@ -33,16 +33,14 @@ module GLib
-       if const_lines.include? "<<"
-         @type = "flags"
-         @Type = "Flags"
--        regexp = /^\s*([^\s]*)\s.*\n/
-       else
-         @type = "enum"
-         @Type = "Enum"
--        regexp = /^\s*([^\s,]*).*\n/
-       end
-       consts = []
--      const_lines.scan(regexp){|name|
-+      const_lines.scan(/^\s*([^\s,]*).*\n/) do |name|
-         consts << name[0] unless name[0] =~ /(^[\/\*]|^$)/
--      }
-+      end
-       @prefix = extract_prefix(consts)
-       consts.each do |name|
-         # consts = [name, nick]