- Switch to use vendor_dir with Ruby 1.8.7.

- Make it build with Ruby 1.8.7, too.

Bump PKGREVISION.

5 files changed, 99 insertions, 12 deletions

diff --git a/x11/kdebindings-ruby/Makefile b/x11/kdebindings-ruby/Makefile
index a990f272b5b..7d4ed035871 100644
--- a/x11/kdebindings-ruby/Makefile
+++ b/x11/kdebindings-ruby/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2008/02/20 10:26:49 markd Exp $
+# $NetBSD: Makefile,v 1.9 2008/06/19 15:19:45 taca Exp $
 
 DISTNAME=	kdebindings-${_KDE_VERSION}
 PKGNAME=	kdebindings-ruby-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	Ruby bindings for the KDE integrated X11 desktop
 
diff --git a/x11/kdebindings-ruby/PLIST b/x11/kdebindings-ruby/PLIST
index 83419f0308f..8237db97e12 100644
--- a/x11/kdebindings-ruby/PLIST
+++ b/x11/kdebindings-ruby/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/10/12 11:44:55 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/06/19 15:19:45 taca Exp $
 bin/krubyinit
 bin/qtrubyinit
 bin/rbkconfig_compiler
@@ -10,12 +10,12 @@ bin/rbuic
 include/smoke.h
 lib/libsmokekde.la
 lib/libsmokeqt.la
-${RUBY_SITELIBDIR}/KDE/korundum.rb
-${RUBY_SITELIBDIR}/Korundum.rb
-${RUBY_SITELIBDIR}/Qt.rb
-${RUBY_SITELIBDIR}/Qt/qtruby.rb
-${RUBY_SITEARCHLIBDIR}/korundum.la
-${RUBY_SITEARCHLIBDIR}/qtruby.la
-${RUBY_SITEARCHLIBDIR}/qui.la
-@dirrm ${RUBY_SITELIBDIR}/Qt
-@dirrm ${RUBY_SITELIBDIR}/KDE
+${RUBY_VENDORLIB}/KDE/korundum.rb
+${RUBY_VENDORLIB}/Korundum.rb
+${RUBY_VENDORLIB}/Qt.rb
+${RUBY_VENDORLIB}/Qt/qtruby.rb
+${RUBY_VENDORARCHLIB}/korundum.la
+${RUBY_VENDORARCHLIB}/qtruby.la
+${RUBY_VENDORARCHLIB}/qui.la
+@dirrm ${RUBY_VENDORLIB}/Qt
+@dirrm ${RUBY_VENDORLIB}/KDE
diff --git a/x11/kdebindings-ruby/distinfo b/x11/kdebindings-ruby/distinfo
index 0ca1381661f..3675a7a6aa2 100644
--- a/x11/kdebindings-ruby/distinfo
+++ b/x11/kdebindings-ruby/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.5 2008/02/20 10:26:49 markd Exp $
+$NetBSD: distinfo,v 1.6 2008/06/19 15:19:45 taca Exp $
 
 SHA1 (kdebindings-3.5.9.tar.bz2) = 14fcec6c93bffa94b10201dd03d87ffcd6fb5281
 RMD160 (kdebindings-3.5.9.tar.bz2) = c2c906a61c72eb8edfb6f9b82d74b7cc2d0c222c
 Size (kdebindings-3.5.9.tar.bz2) = 5737416 bytes
+SHA1 (patch-aa) = 33f36f65423da2e56d01c22bc4a1e657d0a3a456
+SHA1 (patch-ab) = c15b62faf9a72cf89aa84f38c90d99d105e50095
diff --git a/x11/kdebindings-ruby/patches/patch-aa b/x11/kdebindings-ruby/patches/patch-aa
new file mode 100644
index 00000000000..f4a18323486
--- /dev/null
+++ b/x11/kdebindings-ruby/patches/patch-aa
@@ -0,0 +1,26 @@
+$NetBSD: patch-aa,v 1.1 2008/06/19 15:19:45 taca Exp $
+
+--- configure.orig	2008-02-13 15:00:15.000000000 +0000
++++ configure
+@@ -44789,8 +44789,8 @@ else
+   { echo "$as_me:$LINENO: checking for ruby dirs" >&5
+ echo $ECHO_N "checking for ruby dirs... $ECHO_C" >&6; }
+   RUBY_ARCHDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG["archdir"])'`
+-  RUBY_SITEARCHDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG["sitearchdir"])'`
+-  RUBY_SITEDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG["sitelibdir"])'`
++  RUBY_SITEARCHDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG["vendorarchdir"])'`
++  RUBY_SITEDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG["vendorlibdir"])'`
+   { echo "$as_me:$LINENO: result: archdir $RUBY_ARCHDIR, sitearchdir $RUBY_SITEARCHDIR, sitedir $RUBY_SITEDIR" >&5
+ echo "${ECHO_T}archdir $RUBY_ARCHDIR, sitearchdir $RUBY_SITEARCHDIR, sitedir $RUBY_SITEDIR" >&6; }
+ 
+@@ -54593,8 +54593,8 @@ else
+   { echo "$as_me:$LINENO: checking for ruby dirs" >&5
+ echo $ECHO_N "checking for ruby dirs... $ECHO_C" >&6; }
+   RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG["archdir"])'`
+-  RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG["sitearchdir"])'`
+-  RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG["sitelibdir"])'`
++  RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG["vendorarchdir"])'`
++  RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG["vendorlibdir"])'`
+   RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG["libdir"])'`
+   RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG["LIBRUBYARG_SHARED"])'`
+   { echo "$as_me:$LINENO: result: archdir $RUBY_ARCHDIR, sitearchdir $RUBY_SITEARCHDIR, sitedir $RUBY_SITEDIR, libdir $RUBY_LIBDIR, librubyarg $RUBY_LIBRUBYARG" >&5
diff --git a/x11/kdebindings-ruby/patches/patch-ab b/x11/kdebindings-ruby/patches/patch-ab
new file mode 100644
index 00000000000..b4fffed232b
--- /dev/null
+++ b/x11/kdebindings-ruby/patches/patch-ab
@@ -0,0 +1,58 @@
+$NetBSD: patch-ab,v 1.1 2008/06/19 15:19:45 taca Exp $
+
+--- qtruby/rubylib/qtruby/Qt.cpp.orig	2007-01-15 11:19:09.000000000 +0000
++++ qtruby/rubylib/qtruby/Qt.cpp
+@@ -950,7 +950,7 @@ cast_object_to(VALUE /*self*/, VALUE obj
+ const char *
+ get_VALUEtype(VALUE ruby_value)
+ {
+-	char * classname = rb_obj_classname(ruby_value);
++	const char * classname = rb_obj_classname(ruby_value);
+     const char *r = "";
+     if(ruby_value == Qnil)
+ 	r = "u";
+@@ -1395,7 +1395,7 @@ static Smoke::Index new_qvariant_qmap = 
+ }
+ 
+ static QCString *
+-find_cached_selector(int argc, VALUE * argv, VALUE klass, char * methodName)
++find_cached_selector(int argc, VALUE * argv, VALUE klass, const char * methodName)
+ {
+     // Look in the cache
+ static QCString * mcid = 0;
+@@ -1432,7 +1432,7 @@ static QCString * mcid = 0;
+ static VALUE
+ method_missing(int argc, VALUE * argv, VALUE self)
+ {
+-	char * methodName = rb_id2name(SYM2ID(argv[0]));
++	const char * methodName = rb_id2name(SYM2ID(argv[0]));
+     VALUE klass = rb_funcall(self, rb_intern("class"), 0);
+ 
+ 	// Look for 'thing?' methods, and try to match isThing() or hasThing() in the Smoke runtime
+@@ -1482,7 +1482,7 @@ static QString * pred = 0;
+ 
+ 			VALUE retval = rb_funcall2(qt_internal_module, rb_intern("do_method_missing"), argc+3, temp_stack);
+ 			if (_current_method == -1) {
+-				char * op = rb_id2name(SYM2ID(argv[0]));
++				const char * op = rb_id2name(SYM2ID(argv[0]));
+ 				if (	qstrcmp(op, "-") == 0
+ 						|| qstrcmp(op, "+") == 0
+ 						|| qstrcmp(op, "/") == 0
+@@ -1557,7 +1557,7 @@ static VALUE
+ class_method_missing(int argc, VALUE * argv, VALUE klass)
+ {
+ 	VALUE result = Qnil;
+-	char * methodName = rb_id2name(SYM2ID(argv[0]));
++	const char * methodName = rb_id2name(SYM2ID(argv[0]));
+ 	VALUE * temp_stack = (VALUE *) calloc(argc+3, sizeof(VALUE));
+     temp_stack[0] = rb_str_new2("Qt");
+     temp_stack[1] = rb_str_new2(methodName);
+@@ -1772,7 +1772,7 @@ qapplication_argv(VALUE /*self*/)
+ VALUE
+ getmetainfo(VALUE self, int &offset, int &index)
+ {
+-    char * signalname = rb_id2name(rb_frame_last_func());
++    const char * signalname = rb_id2name(rb_frame_last_func());
+     VALUE metaObject_value = rb_funcall(qt_internal_module, rb_intern("getMetaObject"), 1, self);
+ 
+     smokeruby_object *ometa = value_obj_info(metaObject_value);