Fri Sep 10 04:07:53 2010 UTC ()
* Add patches for Ruby 1.9.
* Remove RUBY_HAS_ARCHLIB.

No functional change.


(taca)
diff -r1.23 -r1.24 pkgsrc/databases/qdbm/distinfo
diff -r0 -r1.1 pkgsrc/databases/qdbm/patches/patch-ah
diff -r0 -r1.1 pkgsrc/databases/qdbm/patches/patch-ai
diff -r0 -r1.1 pkgsrc/databases/qdbm/patches/patch-aj
diff -r1.10 -r1.11 pkgsrc/databases/ruby-qdbm/Makefile
cvs diff -r1.23 -r1.24 pkgsrc/databases/qdbm/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/qdbm/distinfo 2008/06/19 14:45:38 1.23
+++ pkgsrc/databases/qdbm/distinfo 2010/09/10 04:07:52 1.24
@@ -1,12 +1,15 @@ @@ -1,12 +1,15 @@
1$NetBSD: distinfo,v 1.23 2008/06/19 14:45:38 taca Exp $ 1$NetBSD: distinfo,v 1.24 2010/09/10 04:07:52 taca Exp $
2 2
3SHA1 (qdbm-1.8.77.tar.gz) = e277e77bc0209cc4c8eb205a9082ef880048445c 3SHA1 (qdbm-1.8.77.tar.gz) = e277e77bc0209cc4c8eb205a9082ef880048445c
4RMD160 (qdbm-1.8.77.tar.gz) = 3c684a4127204faf32472d29d7fd64a07e394332 4RMD160 (qdbm-1.8.77.tar.gz) = 3c684a4127204faf32472d29d7fd64a07e394332
5Size (qdbm-1.8.77.tar.gz) = 948271 bytes 5Size (qdbm-1.8.77.tar.gz) = 948271 bytes
6SHA1 (patch-aa) = 8299b37a6bbd7c711df033f51ee0d828492d40ee 6SHA1 (patch-aa) = 8299b37a6bbd7c711df033f51ee0d828492d40ee
7SHA1 (patch-ab) = 973e4e2e4e88f6a999456347380aedc19b3f0425 7SHA1 (patch-ab) = 973e4e2e4e88f6a999456347380aedc19b3f0425
8SHA1 (patch-ac) = 7986596c900d20d2b26a8906eca1d925060bec91 8SHA1 (patch-ac) = 7986596c900d20d2b26a8906eca1d925060bec91
9SHA1 (patch-ad) = 38b1852cabca8c064bd2a6a4639368e812869448 9SHA1 (patch-ad) = 38b1852cabca8c064bd2a6a4639368e812869448
10SHA1 (patch-ae) = aa90ad3e228f765b0ac0a8a6744f7af0f4cf9a7f 10SHA1 (patch-ae) = aa90ad3e228f765b0ac0a8a6744f7af0f4cf9a7f
11SHA1 (patch-af) = 3aae0b089f9ace97f48ee5070123350f80643f83 11SHA1 (patch-af) = 3aae0b089f9ace97f48ee5070123350f80643f83
12SHA1 (patch-ag) = 6a8df8c41db5d804b39572af0e9d1f201fc1a058 12SHA1 (patch-ag) = 6a8df8c41db5d804b39572af0e9d1f201fc1a058
 13SHA1 (patch-ah) = e857d2bd82ace8396316c70fe2e35c450477616f
 14SHA1 (patch-ai) = 68f87529b45a1f4b87cdb598ef0cb4eb13bef035
 15SHA1 (patch-aj) = e1e6d3b73f8abbf2329b12d5b3ff3aa82f6421b3
File Added: pkgsrc/databases/qdbm/patches/patch-ah
$NetBSD: patch-ah,v 1.1 2010/09/10 04:07:53 taca Exp $

Avoid to use old API for Ruby 1.9.

--- ruby/curia/mod_curia.c.orig	2006-09-25 12:26:06.000000000 +0000
+++ ruby/curia/mod_curia.c
@@ -233,7 +233,7 @@ static VALUE rbcropen(VALUE vself, VALUE
   const char *name;
   int index, omode, bnum, dnum;
   if((index = getnewindex()) == -1) myerror(DP_EMISC);
-  name = STR2CSTR(vname);
+  name = StringValuePtr(vname);
   FIXNUM_P(vomode);
   omode = FIX2INT(vomode);
   FIXNUM_P(vbnum);
@@ -276,10 +276,10 @@ static VALUE rbcrput(VALUE vself, VALUE 
   int index, ksiz, vsiz, dmode;
   FIXNUM_P(vindex);
   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
-  kbuf = STR2CSTR(vkey);
-  ksiz = RSTRING(vkey)->len;
-  vbuf = STR2CSTR(vval);
-  vsiz = RSTRING(vval)->len;
+  kbuf = StringValuePtr(vkey);
+  ksiz = RSTRING_LEN(vkey);
+  vbuf = StringValuePtr(vval);
+  vsiz = RSTRING_LEN(vval);
   FIXNUM_P(vdmode);
   dmode = FIX2INT(vdmode);
   curia = crtable[index];
@@ -297,8 +297,8 @@ static VALUE rbcrout(VALUE vself, VALUE 
   int index, ksiz;
   FIXNUM_P(vindex);
   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
-  kbuf = STR2CSTR(vkey);
-  ksiz = RSTRING(vkey)->len;
+  kbuf = StringValuePtr(vkey);
+  ksiz = RSTRING_LEN(vkey);
   curia = crtable[index];
   if(!crout(curia, kbuf, ksiz)){
     if(crsltable[index] && dpecode == DP_ENOITEM) return Qfalse;
@@ -316,8 +316,8 @@ static VALUE rbcrget(VALUE vself, VALUE 
   VALUE vval;
   FIXNUM_P(vindex);
   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
-  kbuf = STR2CSTR(vkey);
-  ksiz = RSTRING(vkey)->len;
+  kbuf = StringValuePtr(vkey);
+  ksiz = RSTRING_LEN(vkey);
   FIXNUM_P(vstart);
   start = FIX2INT(vstart);
   FIXNUM_P(vmax);
@@ -339,8 +339,8 @@ static VALUE rbcrvsiz(VALUE vself, VALUE
   int index, ksiz, vsiz;
   FIXNUM_P(vindex);
   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
-  kbuf = STR2CSTR(vkey);
-  ksiz = RSTRING(vkey)->len;
+  kbuf = StringValuePtr(vkey);
+  ksiz = RSTRING_LEN(vkey);
   curia = crtable[index];
   if((vsiz = crvsiz(curia, kbuf, ksiz)) == -1){
     if(crsltable[index] && dpecode == DP_ENOITEM) return INT2FIX(-1);
File Added: pkgsrc/databases/qdbm/patches/patch-ai
$NetBSD: patch-ai,v 1.1 2010/09/10 04:07:53 taca Exp $

Avoid to use old API for Ruby 1.9.

--- ruby/depot/mod_depot.c.orig	2006-09-25 12:21:38.000000000 +0000
+++ ruby/depot/mod_depot.c
@@ -232,7 +232,7 @@ static VALUE rbdpopen(VALUE vself, VALUE
   const char *name;
   int index, omode, bnum;
   if((index = getnewindex()) == -1) myerror(DP_EMISC);
-  name = STR2CSTR(vname);
+  name = StringValuePtr(vname);
   FIXNUM_P(vomode);
   omode = FIX2INT(vomode);
   FIXNUM_P(vbnum);
@@ -273,10 +273,10 @@ static VALUE rbdpput(VALUE vself, VALUE 
   int index, ksiz, vsiz, dmode;
   FIXNUM_P(vindex);
   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
-  kbuf = STR2CSTR(vkey);
-  ksiz = RSTRING(vkey)->len;
-  vbuf = STR2CSTR(vval);
-  vsiz = RSTRING(vval)->len;
+  kbuf = StringValuePtr(vkey);
+  ksiz = RSTRING_LEN(vkey);
+  vbuf = StringValuePtr(vval);
+  vsiz = RSTRING_LEN(vval);
   FIXNUM_P(vdmode);
   dmode = FIX2INT(vdmode);
   depot = dptable[index];
@@ -294,8 +294,8 @@ static VALUE rbdpout(VALUE vself, VALUE 
   int index, ksiz;
   FIXNUM_P(vindex);
   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
-  kbuf = STR2CSTR(vkey);
-  ksiz = RSTRING(vkey)->len;
+  kbuf = StringValuePtr(vkey);
+  ksiz = RSTRING_LEN(vkey);
   depot = dptable[index];
   if(!dpout(depot, kbuf, ksiz)){
     if(dpsltable[index] && dpecode == DP_ENOITEM) return Qfalse;
@@ -313,8 +313,8 @@ static VALUE rbdpget(VALUE vself, VALUE 
   VALUE vval;
   FIXNUM_P(vindex);
   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
-  kbuf = STR2CSTR(vkey);
-  ksiz = RSTRING(vkey)->len;
+  kbuf = StringValuePtr(vkey);
+  ksiz = RSTRING_LEN(vkey);
   FIXNUM_P(vstart);
   start = FIX2INT(vstart);
   FIXNUM_P(vmax);
@@ -336,8 +336,8 @@ static VALUE rbdpvsiz(VALUE vself, VALUE
   int index, ksiz, vsiz;
   FIXNUM_P(vindex);
   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
-  kbuf = STR2CSTR(vkey);
-  ksiz = RSTRING(vkey)->len;
+  kbuf = StringValuePtr(vkey);
+  ksiz = RSTRING_LEN(vkey);
   depot = dptable[index];
   if((vsiz = dpvsiz(depot, kbuf, ksiz)) == -1){
     if(dpsltable[index] && dpecode == DP_ENOITEM) return INT2FIX(-1);
File Added: pkgsrc/databases/qdbm/patches/patch-aj
$NetBSD: patch-aj,v 1.1 2010/09/10 04:07:53 taca Exp $

Avoid to use old API for Ruby 1.9.

--- ruby/villa/mod_villa.c.orig	2006-09-25 14:47:04.000000000 +0000
+++ ruby/villa/mod_villa.c
@@ -304,7 +304,7 @@ static VALUE rbvlopen(VALUE vself, VALUE
   int index, omode, cmode;
   VLCFUNC cmp;
   if((index = getnewindex()) == -1) myerror(DP_EMISC);
-  name = STR2CSTR(vname);
+  name = StringValuePtr(vname);
   FIXNUM_P(vomode);
   omode = FIX2INT(vomode);
   FIXNUM_P(vcmode);
@@ -352,10 +352,10 @@ static VALUE rbvlput(VALUE vself, VALUE 
   int index, ksiz, vsiz, dmode;
   FIXNUM_P(vindex);
   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
-  kbuf = STR2CSTR(vkey);
-  ksiz = RSTRING(vkey)->len;
-  vbuf = STR2CSTR(vval);
-  vsiz = RSTRING(vval)->len;
+  kbuf = StringValuePtr(vkey);
+  ksiz = RSTRING_LEN(vkey);
+  vbuf = StringValuePtr(vval);
+  vsiz = RSTRING_LEN(vval);
   FIXNUM_P(vdmode);
   dmode = FIX2INT(vdmode);
   villa = vltable[index];
@@ -373,8 +373,8 @@ static VALUE rbvlout(VALUE vself, VALUE 
   int index, ksiz;
   FIXNUM_P(vindex);
   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
-  kbuf = STR2CSTR(vkey);
-  ksiz = RSTRING(vkey)->len;
+  kbuf = StringValuePtr(vkey);
+  ksiz = RSTRING_LEN(vkey);
   villa = vltable[index];
   if(!vlout(villa, kbuf, ksiz)){
     if(vlsltable[index] && dpecode == DP_ENOITEM) return Qfalse;
@@ -391,8 +391,8 @@ static VALUE rbvlget(VALUE vself, VALUE 
   VALUE vval;
   FIXNUM_P(vindex);
   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
-  kbuf = STR2CSTR(vkey);
-  ksiz = RSTRING(vkey)->len;
+  kbuf = StringValuePtr(vkey);
+  ksiz = RSTRING_LEN(vkey);
   villa = vltable[index];
   if(!(vbuf = vlget(villa, kbuf, ksiz, &vsiz))){
     if(vlsltable[index] && dpecode == DP_ENOITEM) return Qnil;
@@ -409,8 +409,8 @@ static VALUE rbvlvsiz(VALUE vself, VALUE
   int index, ksiz, vsiz;
   FIXNUM_P(vindex);
   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
-  kbuf = STR2CSTR(vkey);
-  ksiz = RSTRING(vkey)->len;
+  kbuf = StringValuePtr(vkey);
+  ksiz = RSTRING_LEN(vkey);
   villa = vltable[index];
   if((vsiz = vlvsiz(villa, kbuf, ksiz)) == -1){
     if(vlsltable[index] && dpecode == DP_ENOITEM) return INT2FIX(-1);
@@ -426,8 +426,8 @@ static VALUE rbvlvnum(VALUE vself, VALUE
   int index, ksiz, vnum;
   FIXNUM_P(vindex);
   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
-  kbuf = STR2CSTR(vkey);
-  ksiz = RSTRING(vkey)->len;
+  kbuf = StringValuePtr(vkey);
+  ksiz = RSTRING_LEN(vkey);
   villa = vltable[index];
   vnum = vlvnum(villa, kbuf, ksiz);
   return INT2FIX(vnum);
@@ -497,8 +497,8 @@ static VALUE rbvlcurjump(VALUE vself, VA
   VALUE vval;
   FIXNUM_P(vindex);
   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
-  kbuf = STR2CSTR(vkey);
-  ksiz = RSTRING(vkey)->len;
+  kbuf = StringValuePtr(vkey);
+  ksiz = RSTRING_LEN(vkey);
   FIXNUM_P(vjmode);
   jmode = FIX2INT(vjmode);
   villa = vltable[index];
@@ -551,8 +551,8 @@ static VALUE rbvlcurput(VALUE vself, VAL
   int index, vsiz, cpmode;
   FIXNUM_P(vindex);
   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
-  vbuf = STR2CSTR(vval);
-  vsiz = RSTRING(vval)->len;
+  vbuf = StringValuePtr(vval);
+  vsiz = RSTRING_LEN(vval);
   FIXNUM_P(vcpmode);
   cpmode = FIX2INT(vcpmode);
   villa = vltable[index];
cvs diff -r1.10 -r1.11 pkgsrc/databases/ruby-qdbm/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/ruby-qdbm/Makefile 2009/12/23 07:34:25 1.10
+++ pkgsrc/databases/ruby-qdbm/Makefile 2010/09/10 04:07:53 1.11
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.10 2009/12/23 07:34:25 obache Exp $ 1# $NetBSD: Makefile,v 1.11 2010/09/10 04:07:53 taca Exp $
2# 2#
3 3
4.include "../../databases/qdbm/Makefile.common" 4.include "../../databases/qdbm/Makefile.common"
5 5
6PKGNAME= ${RUBY_PKGPREFIX}-qdbm-1.0.0.${QDBM_VERSION} 6PKGNAME= ${RUBY_PKGPREFIX}-qdbm-1.0.0.${QDBM_VERSION}
7PKGREVISION= 1 7PKGREVISION= 1
8CATEGORIES= databases ruby 8CATEGORIES= databases ruby
9 9
10MAINTAINER= obache@NetBSD.org 10MAINTAINER= obache@NetBSD.org
11HOMEPAGE= http://qdbm.sourceforge.net/ 11HOMEPAGE= http://qdbm.sourceforge.net/
12COMMENT= Ruby interface of QDBM 12COMMENT= Ruby interface of QDBM
13LICENSE= gnu-lgpl-v2.1 13LICENSE= gnu-lgpl-v2.1
14 14
@@ -16,27 +16,26 @@ PKG_DESTDIR_SUPPORT= user-destdir @@ -16,27 +16,26 @@ PKG_DESTDIR_SUPPORT= user-destdir
16 16
17MAKE_JOBS_SAFE= no 17MAKE_JOBS_SAFE= no
18 18
19MY_SUBDIR= ruby 19MY_SUBDIR= ruby
20BUILD_DIRS= ${MY_SUBDIR} 20BUILD_DIRS= ${MY_SUBDIR}
21CONFIGURE_DIRS= ${MY_SUBDIR} 21CONFIGURE_DIRS= ${MY_SUBDIR}
22 22
23GNU_CONFIGURE= yes 23GNU_CONFIGURE= yes
24MAKE_ENV+= RUBY_EXTCONF_ARGS=${RUBY_EXTCONF_ARGS:Q} 24MAKE_ENV+= RUBY_EXTCONF_ARGS=${RUBY_EXTCONF_ARGS:Q}
25TEST_TARGET= check 25TEST_TARGET= check
26#USE_RUBY_EXTCONF= yes 26#USE_RUBY_EXTCONF= yes
27#RUBY_EXTCONF_SUBDIRS= ${MY_SUBDIR}/curia ${MY_SUBDIR}/depot ${MY_SUBDIR}/villa 27#RUBY_EXTCONF_SUBDIRS= ${MY_SUBDIR}/curia ${MY_SUBDIR}/depot ${MY_SUBDIR}/villa
28RUBY_EXTCONF_ARGS= --with-opt-dir=${PREFIX:Q} --vendor 28RUBY_EXTCONF_ARGS= --with-opt-dir=${PREFIX:Q} --vendor
29RUBY_HAS_ARCHLIB= yes 
30USE_TOOLS+= gmake 29USE_TOOLS+= gmake
31 30
32REPLACE_RUBY= ${MY_SUBDIR}/curia/rbcrtest ${MY_SUBDIR}/depot/rbdptest \ 31REPLACE_RUBY= ${MY_SUBDIR}/curia/rbcrtest ${MY_SUBDIR}/depot/rbdptest \
33 ${MY_SUBDIR}/villa/rbvltest 32 ${MY_SUBDIR}/villa/rbvltest
34 33
35.include "../../databases/qdbm/buildlink3.mk" 34.include "../../databases/qdbm/buildlink3.mk"
36.include "../../lang/ruby/modules.mk" 35.include "../../lang/ruby/modules.mk"
37.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} != "none" 36.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} != "none"
38SUBST_CLASSES+= pthread 37SUBST_CLASSES+= pthread
39SUBST_STAGE.pthread= pre-configure 38SUBST_STAGE.pthread= pre-configure
40SUBST_FILES.pthread= ${MY_SUBDIR}/configure 39SUBST_FILES.pthread= ${MY_SUBDIR}/configure
41SUBST_SED.pthread= -e 's|-lpthread|${PTHREAD_LIBS}|' 40SUBST_SED.pthread= -e 's|-lpthread|${PTHREAD_LIBS}|'
42.endif 41.endif