Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2013Q2

Browse Source
This commit is contained in:
sambuc
2013-09-26 17:14:40 +02:00
commit 785076ae39
74991 changed files with 4380255 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
databases/qdbm/patches/patch-aa
+13
View File
@@ -0,0 +1,13 @@
$NetBSD: patch-aa,v 1.7 2007/10/16 14:06:35 obache Exp $
--- Makefile.in.orig 2007-03-07 02:41:10.000000000 +0000
+++ Makefile.in
@@ -45,7 +45,7 @@ MYLIBDIR = @libdir@
MYBINDIR = @bindir@
MYMAN1DIR = @mandir@/man1
MYMAN3DIR = @mandir@/man3
-MYDATADIR = @datadir@/$(PACKAGE)
+MYDATADIR = @datadir@/doc/$(PACKAGE)
MYPCDIR = @libdir@/pkgconfig
DESTDIR =
databases/qdbm/patches/patch-ab
+44
View File
@@ -0,0 +1,44 @@
$NetBSD: patch-ab,v 1.3 2007/03/05 15:56:27 obache Exp $
--- perl/Makefile.in.orig 2006-11-12 21:18:12.000000000 +0900
+++ perl/Makefile.in
@@ -21,16 +21,16 @@ MYDOCS = plspex.html plspex-ja.html plap
prefix = @prefix@
exec_prefix = @exec_prefix@
MYBINDIR = @bindir@
-MYDATADIR = @datadir@/$(PACKAGE)/perl
+MYDATADIR = @datadir@/doc/$(PACKAGE)/perl
DESTDIR =
# Building binaries
CC = gcc
-INC = -I. -I../.. -I$(HOME)/include -I/usr/local/include
+INC = -I. -I../..
OPTIMIZE = -O2
LD = gcc
-LIBS = -L../.. -I$(HOME)/lib -L/usr/local/lib -lqdbm @LIBS@
-RUNENV = LD_LIBRARY_PATH=.:..:../..:/usr/local/lib:$(HOME)/lib
+LIBS = -L../.. -lqdbm @LIBS@
+RUNENV = LD_LIBRARY_PATH=.:..:../..
@@ -42,15 +42,15 @@ RUNENV = LD_LIBRARY_PATH=.:..:../..:/usr
all :
cd depot && [ -f Makefile ] || \
$(RUNENV) perl Makefile.PL CC="$(CC)" INC="$(INC)" OPTIMIZE="$(OPTIMIZE)" \
- LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" ; \
+ LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" INSTALLDIRS=vendor ; \
$(RUNENV) make
cd curia && [ -f Makefile ] || \
$(RUNENV) perl Makefile.PL CC="$(CC)" INC="$(INC)" OPTIMIZE="$(OPTIMIZE)" \
- LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" ; \
+ LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" INSTALLDIRS=vendor ; \
$(RUNENV) make
cd villa && [ -f Makefile ] || \
$(RUNENV) perl Makefile.PL CC="$(CC)" INC="$(INC)" OPTIMIZE="$(OPTIMIZE)" \
- LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" ; \
+ LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" INSTALLDIRS=vendor ; \
$(RUNENV) make
@printf '\n'
@printf '#================================================================\n'
databases/qdbm/patches/patch-ac
+30
View File
@@ -0,0 +1,30 @@
$NetBSD: patch-ac,v 1.3 2007/03/05 15:56:27 obache Exp $
--- cgi/Makefile.in.orig 2006-08-24 11:55:35.000000000 +0900
+++ cgi/Makefile.in
@@ -22,19 +22,19 @@ MYDOCS = cgispex.html cgispex-ja.html
# Building binaries
CC = gcc
-CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. -I$(HOME)/include -I/usr/local/include \
+CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. \
-D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__=1 -D_HPUX_SOURCE=1 \
-D_POSIX_MAPPED_FILES=1 -D_POSIX_SYNCHRONIZED_IO=1 -DNDEBUG
-CFLAGS = -Wall -ansi -pedantic -fsigned-char -O2
+CFLAGS = ${PTHREAD_CFLAGS} -Wall -ansi -pedantic -fsigned-char -O2
LIBS = -lqdbm @LIBS@
-LDFLAGS = -L$(srcdir)/.. -L$(HOME)/lib -L/usr/local/lib $(LIBS)
-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(HOME)/lib:/usr/local/lib:$(prefix)/lib
+LDFLAGS = @LDFLAGS@ -L$(srcdir)/.. $(LIBS)
+LDENV = LD_RUN_PATH=/lib:/usr/lib:$(prefix)/lib
# Install destinations
prefix = @prefix@
exec_prefix = @exec_prefix@
-MYLIBEXECDIR = @libexecdir@
-MYDATADIR = @datadir@/$(PACKAGE)/cgi
+MYLIBEXECDIR = @libexecdir@/cgi-bin
+MYDATADIR = @datadir@/doc/$(PACKAGE)/cgi
DESTDIR =
databases/qdbm/patches/patch-ad
+22
View File
@@ -0,0 +1,22 @@
$NetBSD: patch-ad,v 1.5 2007/10/16 14:06:35 obache Exp $
--- java/Makefile.in.orig 2007-03-07 02:47:59.000000000 +0000
+++ java/Makefile.in
@@ -37,7 +37,7 @@ prefix = @prefix@
exec_prefix = @exec_prefix@
MYHEADDIR = @includedir@
MYLIBDIR = @libdir@
-MYDATADIR = @datadir@/$(PACKAGE)/java
+MYDATADIR = @datadir@/doc/$(PACKAGE)/java
DESTDIR =
# Building binaries
@@ -56,7 +56,7 @@ CPPFLAGS = @CPPFLAGS@ -I$(srcdir) -I$(sr
@MYDEFS@ -D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__=1 -D_HPUX_SOURCE=1 \
-D_POSIX_MAPPED_FILES=1 -D_POSIX_SYNCHRONIZED_IO=1 \
-DPIC=1 -D_THREAD_SAFE=1 -D_REENTRANT=1 -DNDEBUG
-CFLAGS = -Wall -fPIC -fsigned-char -O2 @MYOPTS@
+CFLAGS = ${PTHREAD_CFLAGS} -Wall -fPIC -fsigned-char -O2 @MYOPTS@
LD = @LD@
LIBS = -lqdbm @LIBS@
LIBLDFLAGS = @LDFLAGS@ -L. -L$(srcdir)/.. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib $(LIBS)
databases/qdbm/patches/patch-ae
+22
View File
@@ -0,0 +1,22 @@
$NetBSD: patch-ae,v 1.5 2007/10/16 14:06:35 obache Exp $
--- plus/Makefile.in.orig 2007-03-07 02:44:50.000000000 +0000
+++ plus/Makefile.in
@@ -34,7 +34,7 @@ exec_prefix = @exec_prefix@
MYHEADDIR = @includedir@
MYLIBDIR = @libdir@
MYBINDIR = @bindir@
-MYDATADIR = @datadir@/$(PACKAGE)/plus
+MYDATADIR = @datadir@/doc/$(PACKAGE)/plus
DESTDIR =
# Building binaries
@@ -44,7 +44,7 @@ CPPFLAGS = @CPPFLAGS@ -I$(srcdir) -I$(sr
-D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__=1 -D_HPUX_SOURCE=1 \
-D_POSIX_MAPPED_FILES=1 -D_POSIX_SYNCHRONIZED_IO=1 \
-DPIC=1 -D_THREAD_SAFE=1 -D_REENTRANT=1 -DNDEBUG
-CXXFLAGS = -Wall -ansi -pedantic -fsigned-char -fPIC -O2 -fno-strict-aliasing @MYOPTS@
+CXXFLAGS = ${PTHREAD_CFLAGS} -Wall -ansi -pedantic -fsigned-char -fPIC -O2 -fno-strict-aliasing @MYOPTS@
LD = @LD@
LIBS = -lqdbm @LIBS@
LIBLDFLAGS = @LDFLAGS@ -L. -L$(srcdir)/.. -L$(MYLIBDIR) \
databases/qdbm/patches/patch-af
+26
View File
@@ -0,0 +1,26 @@
$NetBSD: patch-af,v 1.4 2008/06/19 14:45:38 taca Exp $
--- ruby/Makefile.in.orig 2006-09-06 03:37:33.000000000 +0000
+++ ruby/Makefile.in
@@ -21,7 +21,7 @@ MYDOCS = rbspex.html rbspex-ja.html rbap
prefix = @prefix@
exec_prefix = @exec_prefix@
MYBINDIR = @bindir@
-MYDATADIR = @datadir@/$(PACKAGE)/ruby
+MYDATADIR = @datadir@/doc/$(PACKAGE)/ruby
DESTDIR =
# Building binaries
@@ -35,9 +35,9 @@ RUNENV = LD_LIBRARY_PATH=.:..:../..:/usr
all :
- cd depot && [ -f Makefile ] || $(RUNENV) ruby extconf.rb ; $(RUNENV) make
- cd curia && [ -f Makefile ] || $(RUNENV) ruby extconf.rb ; $(RUNENV) make
- cd villa && [ -f Makefile ] || $(RUNENV) ruby extconf.rb ; $(RUNENV) make
+ cd depot && [ -f Makefile ] || $(RUNENV) $(RUBY) extconf.rb $(RUBY_EXTCONF_ARGS); $(RUNENV) make
+ cd curia && [ -f Makefile ] || $(RUNENV) $(RUBY) extconf.rb $(RUBY_EXTCONF_ARGS); $(RUNENV) make
+ cd villa && [ -f Makefile ] || $(RUNENV) $(RUBY) extconf.rb $(RUBY_EXTCONF_ARGS); $(RUNENV) make
@printf '\n'
@printf '#================================================================\n'
@printf '# Ready to install.\n'
databases/qdbm/patches/patch-ag
+57
View File
@@ -0,0 +1,57 @@
$NetBSD: patch-ag,v 1.5 2008/06/14 14:48:01 obache Exp $
--- LTmakefile.in.orig 2007-03-05 06:58:16.000000000 +0000
+++ LTmakefile.in
@@ -37,7 +37,7 @@ MYLIBDIR = @libdir@
MYBINDIR = @bindir@
MYMAN1DIR = @mandir@/man1
MYMAN3DIR = @mandir@/man3
-MYSHAREDIR = $(prefix)/share/$(PACKAGE)
+MYSHAREDIR = $(prefix)/share/doc/$(PACKAGE)
MYPCDIR = @libdir@/pkgconfig
# Building binaries
@@ -46,11 +46,11 @@ CC = gcc
CFLAGS = -I. -I$(MYHEADDIR) -I$(HOME)/include -I/usr/local/include @MYDEFS@ \
-D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__=1 -D_HPUX_SOURCE=1 \
-D_POSIX_MAPPED_FILES=1 -D_POSIX_SYNCHRONIZED_IO=1 \
- -DPIC=1 -D_THREAD_SAFE=1 -D_REENTRANT=1 -DNDEBUG -O3
+ -DPIC=1 -D_THREAD_SAFE=1 ${PTHREAD_CFLAGS} -DNDEBUG -O3
LD = gcc
-LIBLDFLAGS = -rpath $(MYLIBDIR) -R $(MYLIBDIR) \
+LIBLDFLAGS = @LDFLAGS@ -rpath $(MYLIBDIR) -R $(MYLIBDIR) \
-version-info $$(($(LIBVER)+$(LIBREV))):0:$(LIBREV) @LIBS@
-LDFLAGS = -rpath $(MYLIBDIR) -R $(MYLIBDIR) -L. -lqdbm @LIBS@
+LDFLAGS = @LDFLAGS@ -rpath $(MYLIBDIR) -R $(MYLIBDIR) -L. -lqdbm @LIBS@
INSTALL = install
MKDIR = mkdir -p
CP = cp -rf
@@ -89,17 +89,17 @@ clean :
install :
- $(LIBTOOL) --mode=install $(INSTALL) $(MYHEADS) $(MYHEADDIR)
- $(LIBTOOL) --mode=install $(INSTALL) $(MYLIBS) $(MYLIBDIR)
- $(LIBTOOL) --mode=install $(INSTALL) $(MYBINS) $(MYBINDIR)
- $(MKDIR) $(MYMAN1DIR)
- cd man && $(CP) $(MYMAN1S) $(MYMAN1DIR)
- $(MKDIR) $(MYMAN3DIR)
- cd man && $(CP) $(MYMAN3S) $(MYMAN3DIR)
- $(MKDIR) $(MYSHAREDIR)
- $(CP) $(MYDOCS) $(MYSHAREDIR)
- $(MKDIR) $(MYPCDIR)
- $(CP) $(MYPCS) $(MYPCDIR)
+ ${BSD_INSTALL_DATA} $(MYHEADS) $(DESTDIR)$(MYHEADDIR)
+ $(LIBTOOL) --mode=install $(INSTALL) $(MYLIBS) $(DESTDIR)$(MYLIBDIR)
+ $(LIBTOOL) --mode=install $(INSTALL) $(MYBINS) $(DESTDIR)$(MYBINDIR)
+ ${BSD_INSTALL_MAN_DIR} $(DESTDIR)$(MYMAN1DIR)
+ cd man && ${BSD_INSTALL_MAN} $(MYMAN1S) $(DESTDIR)$(MYMAN1DIR)
+ ${BSD_INSTALL_MAN_DIR} $(DESTDIR)$(MYMAN3DIR)
+ cd man && ${BSD_INSTALL_MAN} $(MYMAN3S) $(DESTDIR)$(MYMAN3DIR)
+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(MYSHAREDIR)
+ ${BSD_INSTALL_DATA} $(MYDOCS) $(DESTDIR)$(MYSHAREDIR)
+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(MYPCDIR)
+ ${BSD_INSTALL_DATA} $(MYPCS) $(DESTDIR)$(MYPCDIR)
@printf '\n'
@printf '#================================================================\n'
@printf '# Thanks for using QDBM.\n'
databases/qdbm/patches/patch-ah
+63
View File
@@ -0,0 +1,63 @@
$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);
databases/qdbm/patches/patch-ai
+63
View File
@@ -0,0 +1,63 @@
$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);
databases/qdbm/patches/patch-aj
+96
View File
@@ -0,0 +1,96 @@
$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];
databases/qdbm/patches/patch-ak
+23
View File
@@ -0,0 +1,23 @@
$NetBSD: patch-ak,v 1.2 2011/07/31 23:45:22 dholland Exp $
Out-of-class member declarations are invalid.
--- plus/xadbm.h.orig 2011-07-21 13:00:18.000000000 +0000
+++ plus/xadbm.h
@@ -72,6 +72,7 @@ private:
* @param latter the latter datum.
* @return reference to a temporary instance.
*/
+#if 0
qdbm::Datum qdbm::operator +(const qdbm::Datum& former, const qdbm::Datum& latter);
/**
* Temporary concatenation operator for Datum.
@@ -87,7 +88,7 @@ qdbm::Datum qdbm::operator +(const qdbm:
* @return reference to a temporary instance.
*/
qdbm::Datum qdbm::operator +(const char* str, const qdbm::Datum& datum);
-
+#endif
/**