- Fix build with Ruby 1.9

4 files changed, 161 insertions, 0 deletions

diff --git a/databases/ruby-qdbm/files/patch-Makefile.in b/databases/ruby-qdbm/files/patch-Makefile.in
new file mode 100644
index 000000000000..bd4099a5c5cb
--- /dev/null
+++ b/databases/ruby-qdbm/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2006-09-06 03:37:33.000000000 +0000
++++ Makefile.in	2011-07-21 03:18:15.000000000 +0000
+@@ -54,7 +54,7 @@
+ 	rm -rf casket *~
+ 
+ 
+-install :
++install : all
+ 	cd depot ; make install
+ 	cd curia ; make install
+ 	cd villa ; make install
diff --git a/databases/ruby-qdbm/files/patch-curia-mod_curia.c b/databases/ruby-qdbm/files/patch-curia-mod_curia.c
new file mode 100644
index 000000000000..7c4e6f5a22a2
--- /dev/null
+++ b/databases/ruby-qdbm/files/patch-curia-mod_curia.c
@@ -0,0 +1,41 @@
+--- curia/mod_curia.c.orig	2011-07-24 16:00:48.000000000 +0000
++++ curia/mod_curia.c	2011-07-24 16:02:05.000000000 +0000
+@@ -277,9 +277,9 @@
+   FIXNUM_P(vindex);
+   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
+   kbuf = STR2CSTR(vkey);
+-  ksiz = RSTRING(vkey)->len;
++  ksiz = RSTRING_LEN(vkey);
+   vbuf = STR2CSTR(vval);
+-  vsiz = RSTRING(vval)->len;
++  vsiz = RSTRING_LEN(vval);
+   FIXNUM_P(vdmode);
+   dmode = FIX2INT(vdmode);
+   curia = crtable[index];
+@@ -298,7 +298,7 @@
+   FIXNUM_P(vindex);
+   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
+   kbuf = STR2CSTR(vkey);
+-  ksiz = RSTRING(vkey)->len;
++  ksiz = RSTRING_LEN(vkey);
+   curia = crtable[index];
+   if(!crout(curia, kbuf, ksiz)){
+     if(crsltable[index] && dpecode == DP_ENOITEM) return Qfalse;
+@@ -317,7 +317,7 @@
+   FIXNUM_P(vindex);
+   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
+   kbuf = STR2CSTR(vkey);
+-  ksiz = RSTRING(vkey)->len;
++  ksiz = RSTRING_LEN(vkey);
+   FIXNUM_P(vstart);
+   start = FIX2INT(vstart);
+   FIXNUM_P(vmax);
+@@ -340,7 +340,7 @@
+   FIXNUM_P(vindex);
+   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
+   kbuf = STR2CSTR(vkey);
+-  ksiz = RSTRING(vkey)->len;
++  ksiz = RSTRING_LEN(vkey);
+   curia = crtable[index];
+   if((vsiz = crvsiz(curia, kbuf, ksiz)) == -1){
+     if(crsltable[index] && dpecode == DP_ENOITEM) return INT2FIX(-1);
diff --git a/databases/ruby-qdbm/files/patch-depot-mod_depot.c b/databases/ruby-qdbm/files/patch-depot-mod_depot.c
new file mode 100644
index 000000000000..2d7bf0146272
--- /dev/null
+++ b/databases/ruby-qdbm/files/patch-depot-mod_depot.c
@@ -0,0 +1,41 @@
+--- depot/mod_depot.c.orig	2011-07-24 15:46:48.000000000 +0000
++++ depot/mod_depot.c	2011-07-24 15:48:24.000000000 +0000
+@@ -274,9 +274,9 @@
+   FIXNUM_P(vindex);
+   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
+   kbuf = STR2CSTR(vkey);
+-  ksiz = RSTRING(vkey)->len;
++  ksiz = RSTRING_LEN(vkey);
+   vbuf = STR2CSTR(vval);
+-  vsiz = RSTRING(vval)->len;
++  vsiz = RSTRING_LEN(vval);
+   FIXNUM_P(vdmode);
+   dmode = FIX2INT(vdmode);
+   depot = dptable[index];
+@@ -295,7 +295,7 @@
+   FIXNUM_P(vindex);
+   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
+   kbuf = STR2CSTR(vkey);
+-  ksiz = RSTRING(vkey)->len;
++  ksiz = RSTRING_LEN(vkey);
+   depot = dptable[index];
+   if(!dpout(depot, kbuf, ksiz)){
+     if(dpsltable[index] && dpecode == DP_ENOITEM) return Qfalse;
+@@ -314,7 +314,7 @@
+   FIXNUM_P(vindex);
+   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
+   kbuf = STR2CSTR(vkey);
+-  ksiz = RSTRING(vkey)->len;
++  ksiz = RSTRING_LEN(vkey);
+   FIXNUM_P(vstart);
+   start = FIX2INT(vstart);
+   FIXNUM_P(vmax);
+@@ -337,7 +337,7 @@
+   FIXNUM_P(vindex);
+   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
+   kbuf = STR2CSTR(vkey);
+-  ksiz = RSTRING(vkey)->len;
++  ksiz = RSTRING_LEN(vkey);
+   depot = dptable[index];
+   if((vsiz = dpvsiz(depot, kbuf, ksiz)) == -1){
+     if(dpsltable[index] && dpecode == DP_ENOITEM) return INT2FIX(-1);
diff --git a/databases/ruby-qdbm/files/patch-villa-mod_villa.c b/databases/ruby-qdbm/files/patch-villa-mod_villa.c
new file mode 100644
index 000000000000..460b73c4eb7b
--- /dev/null
+++ b/databases/ruby-qdbm/files/patch-villa-mod_villa.c
@@ -0,0 +1,68 @@
+--- villa/mod_villa.c.orig	2011-07-24 16:03:33.000000000 +0000
++++ villa/mod_villa.c	2011-07-24 16:05:49.000000000 +0000
+@@ -353,9 +353,9 @@
+   FIXNUM_P(vindex);
+   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
+   kbuf = STR2CSTR(vkey);
+-  ksiz = RSTRING(vkey)->len;
++  ksiz = RSTRING_LEN(vkey);
+   vbuf = STR2CSTR(vval);
+-  vsiz = RSTRING(vval)->len;
++  vsiz = RSTRING_LEN(vval);
+   FIXNUM_P(vdmode);
+   dmode = FIX2INT(vdmode);
+   villa = vltable[index];
+@@ -374,7 +374,7 @@
+   FIXNUM_P(vindex);
+   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
+   kbuf = STR2CSTR(vkey);
+-  ksiz = RSTRING(vkey)->len;
++  ksiz = RSTRING_LEN(vkey);
+   villa = vltable[index];
+   if(!vlout(villa, kbuf, ksiz)){
+     if(vlsltable[index] && dpecode == DP_ENOITEM) return Qfalse;
+@@ -392,7 +392,7 @@
+   FIXNUM_P(vindex);
+   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
+   kbuf = STR2CSTR(vkey);
+-  ksiz = RSTRING(vkey)->len;
++  ksiz = RSTRING_LEN(vkey);
+   villa = vltable[index];
+   if(!(vbuf = vlget(villa, kbuf, ksiz, &vsiz))){
+     if(vlsltable[index] && dpecode == DP_ENOITEM) return Qnil;
+@@ -410,7 +410,7 @@
+   FIXNUM_P(vindex);
+   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
+   kbuf = STR2CSTR(vkey);
+-  ksiz = RSTRING(vkey)->len;
++  ksiz = RSTRING_LEN(vkey);
+   villa = vltable[index];
+   if((vsiz = vlvsiz(villa, kbuf, ksiz)) == -1){
+     if(vlsltable[index] && dpecode == DP_ENOITEM) return INT2FIX(-1);
+@@ -427,7 +427,7 @@
+   FIXNUM_P(vindex);
+   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
+   kbuf = STR2CSTR(vkey);
+-  ksiz = RSTRING(vkey)->len;
++  ksiz = RSTRING_LEN(vkey);
+   villa = vltable[index];
+   vnum = vlvnum(villa, kbuf, ksiz);
+   return INT2FIX(vnum);
+@@ -498,7 +498,7 @@
+   FIXNUM_P(vindex);
+   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
+   kbuf = STR2CSTR(vkey);
+-  ksiz = RSTRING(vkey)->len;
++  ksiz = RSTRING_LEN(vkey);
+   FIXNUM_P(vjmode);
+   jmode = FIX2INT(vjmode);
+   villa = vltable[index];
+@@ -552,7 +552,7 @@
+   FIXNUM_P(vindex);
+   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
+   vbuf = STR2CSTR(vval);
+-  vsiz = RSTRING(vval)->len;
++  vsiz = RSTRING_LEN(vval);
+   FIXNUM_P(vcpmode);
+   cpmode = FIX2INT(vcpmode);
+   villa = vltable[index];