Make this package build on Ruby 2.2.

4 files changed, 38 insertions, 6 deletions

diff --git a/sysutils/ruby-libnotify/Makefile b/sysutils/ruby-libnotify/Makefile
index a940ebb3513..78ce7cba90f 100644
--- a/sysutils/ruby-libnotify/Makefile
+++ b/sysutils/ruby-libnotify/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2015/04/25 14:24:54 tnn Exp $
+# $NetBSD: Makefile,v 1.10 2015/06/10 14:47:59 taca Exp $
 
 DISTNAME=	ruby-libnotify-0.5.1
 PKGNAME=	${DISTNAME:S/ruby/${RUBY_PKGPREFIX}/}
@@ -13,8 +13,6 @@ LICENSE=	gnu-lgpl-v2.1
 
 USE_RUBY_SETUP=	yes
 
-RUBY_VERSION_SUPPORTED=	193 200 21
-
 .include "../../x11/ruby-gnome2-gtk/buildlink3.mk"
 .include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../devel/ruby-pkg-config/tool.mk"
diff --git a/sysutils/ruby-libnotify/distinfo b/sysutils/ruby-libnotify/distinfo
index ac674765d05..1d3fe292fe4 100644
--- a/sysutils/ruby-libnotify/distinfo
+++ b/sysutils/ruby-libnotify/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.3 2013/09/18 08:33:32 obache Exp $
+$NetBSD: distinfo,v 1.4 2015/06/10 14:47:59 taca Exp $
 
 SHA1 (ruby-libnotify-0.5.1.tar.gz) = 49c03da48c80ce962d164338e030114bd99300ef
 RMD160 (ruby-libnotify-0.5.1.tar.gz) = 97285d65f55938b9902841e76e8da69108313a06
 Size (ruby-libnotify-0.5.1.tar.gz) = 25822 bytes
-SHA1 (patch-ext_extconf.rb) = 62094980312bac7ac3f9c8bff423056aefaea3ec
+SHA1 (patch-ext_extconf.rb) = 0f88e4c467f70d7e70c787b3f9bffdcc7f573a0b
 SHA1 (patch-ext_rnotify.c) = f737a74df9eb3556cff6e4f64cbf25413073e30f
+SHA1 (patch-setup.rb) = 1d00946ff78c337e7f8bfb7a4825773f6014f1ac
diff --git a/sysutils/ruby-libnotify/patches/patch-ext_extconf.rb b/sysutils/ruby-libnotify/patches/patch-ext_extconf.rb
index 42de362dcfe..8fb39aa01f6 100644
--- a/sysutils/ruby-libnotify/patches/patch-ext_extconf.rb
+++ b/sysutils/ruby-libnotify/patches/patch-ext_extconf.rb
@@ -1,4 +1,4 @@
-$NetBSD: patch-ext_extconf.rb,v 1.1 2013/09/18 08:33:32 obache Exp $
+$NetBSD: patch-ext_extconf.rb,v 1.2 2015/06/10 14:47:59 taca Exp $
 
 * not using gems in pkgsrc.
 
@@ -13,3 +13,12 @@ $NetBSD: patch-ext_extconf.rb,v 1.1 2013/09/18 08:33:32 obache Exp $
  begin
    require 'mkmf-gnome2'
    require 'gtk2'
+@@ -43,7 +41,7 @@ end
+ if check_required_version("libnotify", 0, 7, 0) == true
+   if have_library("notify", "notify_init") == true
+     $CFLAGS << ' -DDEBUG' if type == 0
+-    $CFLAGS << ' -Wall' << " -I#{Config::CONFIG["sitearchdir"]} " << PKGConfig.cflags("libnotify")
++    $CFLAGS << ' -Wall' << " -I#{RbConfig::CONFIG["sitearchdir"]} " << PKGConfig.cflags("libnotify")
+     $LIBS << ' ' << PKGConfig.libs("libnotify")
+     check_set_app_name_libnotify
+     check_set_notification_name_libnotify
diff --git a/sysutils/ruby-libnotify/patches/patch-setup.rb b/sysutils/ruby-libnotify/patches/patch-setup.rb
new file mode 100644
index 00000000000..5bf95c957b0
--- /dev/null
+++ b/sysutils/ruby-libnotify/patches/patch-setup.rb
@@ -0,0 +1,24 @@
+$NetBSD: patch-setup.rb,v 1.1 2015/06/10 14:47:59 taca Exp $
+
+Do not use obsolete Config.
+
+--- setup.rb.orig	2012-11-24 17:54:50.000000000 +0000
++++ setup.rb
+@@ -102,7 +102,7 @@ end
+ 
+ class ConfigTable
+ 
+-  c = ::Config::CONFIG
++  c = ::RbConfig::CONFIG
+ 
+   rubypath = c['bindir'] + '/' + c['ruby_install_name']
+ 
+@@ -1219,7 +1219,7 @@ class Installer
+         raise InstallError, "no ruby extention exists: 'ruby #{$0} setup' first"
+   end
+ 
+-  DLEXT = /\.#{ ::Config::CONFIG['DLEXT'] }\z/
++  DLEXT = /\.#{ ::RbConfig::CONFIG['DLEXT'] }\z/
+ 
+   def _ruby_extentions(dir)
+     Dir.open(dir) {|d|