[Midnightbsd-cvs] mports [22412] trunk/databases/ruby-bdb/files: add missing files
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Mar 21 08:13:48 EDT 2017
Revision: 22412
http://svnweb.midnightbsd.org/mports/?rev=22412
Author: laffer1
Date: 2017-03-21 08:13:48 -0400 (Tue, 21 Mar 2017)
Log Message:
-----------
add missing files
Added Paths:
-----------
trunk/databases/ruby-bdb/files/extra-patch-src-common.c-21
trunk/databases/ruby-bdb/files/extra-patch-src-common.c-22
trunk/databases/ruby-bdb/files/extra-patch-src-cursor.c-22
trunk/databases/ruby-bdb/files/extra-patch-src-recnum.c-22
trunk/databases/ruby-bdb/files/patch-bdbxml2-bdbxml.h
trunk/databases/ruby-bdb/files/patch-docs_hashlike.rd
trunk/databases/ruby-bdb/files/patch-src-extconf.rb
trunk/databases/ruby-bdb/files/patch-src-features.rb
Added: trunk/databases/ruby-bdb/files/extra-patch-src-common.c-21
===================================================================
--- trunk/databases/ruby-bdb/files/extra-patch-src-common.c-21 (rev 0)
+++ trunk/databases/ruby-bdb/files/extra-patch-src-common.c-21 2017-03-21 12:13:48 UTC (rev 22412)
@@ -0,0 +1,72 @@
+--- src/common.c.orig 2011-04-06 19:35:39.000000000 +0000
++++ src/common.c 2015-01-22 17:06:38.000000000 +0000
+@@ -1570,10 +1570,10 @@
+ #endif
+ switch(dbst->type) {
+ case DB_BTREE:
+- RBASIC(obj)->klass = bdb_cBtree;
++ RBASIC_SET_CLASS_RAW(obj, bdb_cBtree);
+ break;
+ case DB_HASH:
+- RBASIC(obj)->klass = bdb_cHash;
++ RBASIC_SET_CLASS_RAW(obj, bdb_cHash);
+ break;
+ case DB_RECNO:
+ {
+@@ -1581,17 +1581,17 @@
+
+ rb_warning("It's hard to distinguish Recnum with Recno for all versions of Berkeley DB");
+ if ((count = bdb_is_recnum(dbst->dbp)) != -1) {
+- RBASIC(obj)->klass = bdb_cRecnum;
++ RBASIC_SET_CLASS_RAW(obj, bdb_cRecnum);
+ dbst->len = count;
+ }
+ else {
+- RBASIC(obj)->klass = bdb_cRecno;
++ RBASIC_SET_CLASS_RAW(obj, bdb_cRecno);
+ }
+ break;
+ }
+ #if HAVE_CONST_DB_QUEUE
+ case DB_QUEUE:
+- RBASIC(obj)->klass = bdb_cQueue;
++ RBASIC_SET_CLASS_RAW(obj, bdb_cQueue);
+ break;
+ #endif
+ default:
+@@ -1635,29 +1635,29 @@
+ dbst->options = BDB_NOT_OPEN;
+ cl = obj;
+ while (cl) {
+- if (cl == bdb_cBtree || RCLASS(cl)->m_tbl == RCLASS(bdb_cBtree)->m_tbl) {
++ if (cl == bdb_cBtree || RCLASS_M_TBL(cl) == RCLASS_M_TBL(bdb_cBtree)) {
+ dbst->type = DB_BTREE;
+ break;
+ }
+- if (cl == bdb_cRecnum || RCLASS(cl)->m_tbl == RCLASS(bdb_cRecnum)->m_tbl) {
++ if (cl == bdb_cRecnum || RCLASS_M_TBL(cl) == RCLASS_M_TBL(bdb_cRecnum)) {
+ dbst->type = DB_RECNO;
+ break;
+ }
+- else if (cl == bdb_cHash || RCLASS(cl)->m_tbl == RCLASS(bdb_cHash)->m_tbl) {
++ else if (cl == bdb_cHash || RCLASS_M_TBL(cl) == RCLASS_M_TBL(bdb_cHash)) {
+ dbst->type = DB_HASH;
+ break;
+ }
+- else if (cl == bdb_cRecno || RCLASS(cl)->m_tbl == RCLASS(bdb_cRecno)->m_tbl) {
++ else if (cl == bdb_cRecno || RCLASS_M_TBL(cl) == RCLASS_M_TBL(bdb_cRecno)) {
+ dbst->type = DB_RECNO;
+ break;
+ }
+ #if HAVE_CONST_DB_QUEUE
+- else if (cl == bdb_cQueue || RCLASS(cl)->m_tbl == RCLASS(bdb_cQueue)->m_tbl) {
++ else if (cl == bdb_cQueue || RCLASS_M_TBL(cl) == RCLASS_M_TBL(bdb_cQueue)) {
+ dbst->type = DB_QUEUE;
+ break;
+ }
+ #endif
+- else if (cl == bdb_cUnknown || RCLASS(cl)->m_tbl == RCLASS(bdb_cUnknown)->m_tbl) {
++ else if (cl == bdb_cUnknown || RCLASS_M_TBL(cl) == RCLASS_M_TBL(bdb_cUnknown)) {
+ dbst->type = DB_UNKNOWN;
+ break;
+ }
Property changes on: trunk/databases/ruby-bdb/files/extra-patch-src-common.c-21
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/ruby-bdb/files/extra-patch-src-common.c-22
===================================================================
--- trunk/databases/ruby-bdb/files/extra-patch-src-common.c-22 (rev 0)
+++ trunk/databases/ruby-bdb/files/extra-patch-src-common.c-22 2017-03-21 12:13:48 UTC (rev 22412)
@@ -0,0 +1,137 @@
+--- src/common.c.orig 2011-04-06 19:35:39.000000000 +0000
++++ src/common.c 2015-01-22 17:10:32.000000000 +0000
+@@ -1229,7 +1229,7 @@
+ if (argc && TYPE(argv[argc - 1]) == T_HASH) {
+ VALUE v, f = argv[argc - 1];
+
+- if ((v = rb_hash_aref(f, rb_str_new2("txn"))) != RHASH(f)->ifnone) {
++ if ((v = rb_hash_aref(f, rb_str_new2("txn"))) != rb_hash_ifnone(f)) {
+ if (!rb_obj_is_kind_of(v, bdb_cTxn)) {
+ rb_raise(bdb_eFatal, "argument of txn must be a transaction");
+ }
+@@ -1241,7 +1241,7 @@
+ dbst->options |= envst->options & BDB_NO_THREAD;
+ dbst->marshal = txnst->marshal;
+ }
+- else if ((v = rb_hash_aref(f, rb_str_new2("env"))) != RHASH(f)->ifnone) {
++ else if ((v = rb_hash_aref(f, rb_str_new2("env"))) != rb_hash_ifnone(f)) {
+ if (!rb_obj_is_kind_of(v, bdb_cEnv)) {
+ rb_raise(bdb_eFatal, "argument of env must be an environnement");
+ }
+@@ -1254,11 +1254,11 @@
+ #if HAVE_CONST_DB_ENCRYPT
+ if (envst && (envst->options & BDB_ENV_ENCRYPT)) {
+ VALUE tmp = rb_str_new2("set_flags");
+- if ((v = rb_hash_aref(f, rb_intern("set_flags"))) != RHASH(f)->ifnone) {
++ if ((v = rb_hash_aref(f, rb_intern("set_flags"))) != rb_hash_ifnone(f)) {
+ rb_hash_aset(f, rb_intern("set_flags"),
+ INT2NUM(NUM2INT(v) | DB_ENCRYPT));
+ }
+- else if ((v = rb_hash_aref(f, tmp)) != RHASH(f)->ifnone) {
++ else if ((v = rb_hash_aref(f, tmp)) != rb_hash_ifnone(f)) {
+ rb_hash_aset(f, tmp, INT2NUM(NUM2INT(v) | DB_ENCRYPT));
+ }
+ else {
+@@ -1570,10 +1570,10 @@
+ #endif
+ switch(dbst->type) {
+ case DB_BTREE:
+- RBASIC(obj)->klass = bdb_cBtree;
++ RBASIC_SET_CLASS_RAW(obj, bdb_cBtree);
+ break;
+ case DB_HASH:
+- RBASIC(obj)->klass = bdb_cHash;
++ RBASIC_SET_CLASS_RAW(obj, bdb_cHash);
+ break;
+ case DB_RECNO:
+ {
+@@ -1581,17 +1581,17 @@
+
+ rb_warning("It's hard to distinguish Recnum with Recno for all versions of Berkeley DB");
+ if ((count = bdb_is_recnum(dbst->dbp)) != -1) {
+- RBASIC(obj)->klass = bdb_cRecnum;
++ RBASIC_SET_CLASS_RAW(obj, bdb_cRecnum);
+ dbst->len = count;
+ }
+ else {
+- RBASIC(obj)->klass = bdb_cRecno;
++ RBASIC_SET_CLASS_RAW(obj, bdb_cRecno);
+ }
+ break;
+ }
+ #if HAVE_CONST_DB_QUEUE
+ case DB_QUEUE:
+- RBASIC(obj)->klass = bdb_cQueue;
++ RBASIC_SET_CLASS_RAW(obj, bdb_cQueue);
+ break;
+ #endif
+ default:
+@@ -1635,29 +1635,29 @@
+ dbst->options = BDB_NOT_OPEN;
+ cl = obj;
+ while (cl) {
+- if (cl == bdb_cBtree || RCLASS(cl)->m_tbl == RCLASS(bdb_cBtree)->m_tbl) {
++ if (cl == bdb_cBtree || RCLASS_M_TBL(cl) == RCLASS_M_TBL(bdb_cBtree)) {
+ dbst->type = DB_BTREE;
+ break;
+ }
+- if (cl == bdb_cRecnum || RCLASS(cl)->m_tbl == RCLASS(bdb_cRecnum)->m_tbl) {
++ if (cl == bdb_cRecnum || RCLASS_M_TBL(cl) == RCLASS_M_TBL(bdb_cRecnum)) {
+ dbst->type = DB_RECNO;
+ break;
+ }
+- else if (cl == bdb_cHash || RCLASS(cl)->m_tbl == RCLASS(bdb_cHash)->m_tbl) {
++ else if (cl == bdb_cHash || RCLASS_M_TBL(cl) == RCLASS_M_TBL(bdb_cHash)) {
+ dbst->type = DB_HASH;
+ break;
+ }
+- else if (cl == bdb_cRecno || RCLASS(cl)->m_tbl == RCLASS(bdb_cRecno)->m_tbl) {
++ else if (cl == bdb_cRecno || RCLASS_M_TBL(cl) == RCLASS_M_TBL(bdb_cRecno)) {
+ dbst->type = DB_RECNO;
+ break;
+ }
+ #if HAVE_CONST_DB_QUEUE
+- else if (cl == bdb_cQueue || RCLASS(cl)->m_tbl == RCLASS(bdb_cQueue)->m_tbl) {
++ else if (cl == bdb_cQueue || RCLASS_M_TBL(cl) == RCLASS_M_TBL(bdb_cQueue)) {
+ dbst->type = DB_QUEUE;
+ break;
+ }
+ #endif
+- else if (cl == bdb_cUnknown || RCLASS(cl)->m_tbl == RCLASS(bdb_cUnknown)->m_tbl) {
++ else if (cl == bdb_cUnknown || RCLASS_M_TBL(cl) == RCLASS_M_TBL(bdb_cUnknown)) {
+ dbst->type = DB_UNKNOWN;
+ break;
+ }
+@@ -3004,8 +3004,8 @@
+
+ if (argc && TYPE(argv[argc - 1]) == T_HASH) {
+ VALUE g, f = argv[argc - 1];
+- if ((g = rb_hash_aref(f, rb_intern("flags"))) != RHASH(f)->ifnone ||
+- (g = rb_hash_aref(f, rb_str_new2("flags"))) != RHASH(f)->ifnone) {
++ if ((g = rb_hash_aref(f, rb_intern("flags"))) != rb_hash_ifnone(f) ||
++ (g = rb_hash_aref(f, rb_str_new2("flags"))) != rb_hash_ifnone(f)) {
+ flags = NUM2INT(g);
+ }
+ argc--;
+@@ -3323,8 +3323,8 @@
+ flags = 0;
+ if (argc && TYPE(argv[argc - 1]) == T_HASH) {
+ VALUE g, f = argv[argc - 1];
+- if ((g = rb_hash_aref(f, rb_intern("flags"))) != RHASH(f)->ifnone ||
+- (g = rb_hash_aref(f, rb_str_new2("flags"))) != RHASH(f)->ifnone) {
++ if ((g = rb_hash_aref(f, rb_intern("flags"))) != rb_hash_ifnone(f) ||
++ (g = rb_hash_aref(f, rb_str_new2("flags"))) != rb_hash_ifnone(f)) {
+ flags = NUM2INT(g);
+ }
+ argc--;
+@@ -3348,8 +3348,8 @@
+ flags = 0;
+ if (TYPE(argv[argc - 1]) == T_HASH) {
+ VALUE f = argv[argc - 1];
+- if ((g = rb_hash_aref(f, rb_intern("flags"))) != RHASH(f)->ifnone ||
+- (g = rb_hash_aref(f, rb_str_new2("flags"))) != RHASH(f)->ifnone) {
++ if ((g = rb_hash_aref(f, rb_intern("flags"))) != rb_hash_ifnone(f) ||
++ (g = rb_hash_aref(f, rb_str_new2("flags"))) != rb_hash_ifnone(f)) {
+ flags = NUM2INT(g);
+ }
+ argc--;
Property changes on: trunk/databases/ruby-bdb/files/extra-patch-src-common.c-22
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/ruby-bdb/files/extra-patch-src-cursor.c-22
===================================================================
--- trunk/databases/ruby-bdb/files/extra-patch-src-cursor.c-22 (rev 0)
+++ trunk/databases/ruby-bdb/files/extra-patch-src-cursor.c-22 2017-03-21 12:13:48 UTC (rev 22412)
@@ -0,0 +1,13 @@
+--- src/cursor.c.orig 2015-01-22 17:37:51.000000000 +0000
++++ src/cursor.c 2015-01-22 17:38:17.000000000 +0000
+@@ -29,8 +29,8 @@
+ flags = 0;
+ if (argc && TYPE(argv[argc - 1]) == T_HASH) {
+ VALUE g, f = argv[argc - 1];
+- if ((g = rb_hash_aref(f, rb_intern("flags"))) != RHASH(f)->ifnone ||
+- (g = rb_hash_aref(f, rb_str_new2("flags"))) != RHASH(f)->ifnone) {
++ if ((g = rb_hash_aref(f, rb_intern("flags"))) != rb_hash_ifnone(f) ||
++ (g = rb_hash_aref(f, rb_str_new2("flags"))) != rb_hash_ifnone(f)) {
+ flags = NUM2INT(g);
+ }
+ argc--;
Property changes on: trunk/databases/ruby-bdb/files/extra-patch-src-cursor.c-22
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/ruby-bdb/files/extra-patch-src-recnum.c-22
===================================================================
--- trunk/databases/ruby-bdb/files/extra-patch-src-recnum.c-22 (rev 0)
+++ trunk/databases/ruby-bdb/files/extra-patch-src-recnum.c-22 2017-03-21 12:13:48 UTC (rev 22412)
@@ -0,0 +1,22 @@
+--- src/recnum.c.orig 2011-04-06 19:35:39.000000000 +0000
++++ src/recnum.c 2015-01-22 17:16:32.000000000 +0000
+@@ -17,7 +17,7 @@
+ argc++;
+ }
+ rb_hash_aset(argv[argc - 1], array, INT2FIX(0));
+- if (rb_hash_aref(argv[argc - 1], sarray) != RHASH(argv[argc - 1])->ifnone) {
++ if (rb_hash_aref(argv[argc - 1], sarray) != rb_hash_ifnone(argv[argc - 1])) {
+ rb_hash_aset(argv[argc - 1], sarray, INT2FIX(0));
+ }
+ rb_hash_aset(argv[argc - 1], rb_str_new2("set_flags"), INT2FIX(DB_RENUMBER));
+@@ -697,8 +697,8 @@
+
+ if (argc && TYPE(argv[argc - 1]) == T_HASH) {
+ VALUE f = argv[argc - 1];
+- if ((g = rb_hash_aref(f, rb_intern("flags"))) != RHASH(f)->ifnone ||
+- (g = rb_hash_aref(f, rb_str_new2("flags"))) != RHASH(f)->ifnone) {
++ if ((g = rb_hash_aref(f, rb_intern("flags"))) != rb_hash_ifnone(f) ||
++ (g = rb_hash_aref(f, rb_str_new2("flags"))) != rb_hash_ifnone(f)) {
+ flags = NUM2INT(g);
+ }
+ argc--;
Property changes on: trunk/databases/ruby-bdb/files/extra-patch-src-recnum.c-22
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/ruby-bdb/files/patch-bdbxml2-bdbxml.h
===================================================================
--- trunk/databases/ruby-bdb/files/patch-bdbxml2-bdbxml.h (rev 0)
+++ trunk/databases/ruby-bdb/files/patch-bdbxml2-bdbxml.h 2017-03-21 12:13:48 UTC (rev 22412)
@@ -0,0 +1,11 @@
+--- bdbxml2/bdbxml.h.orig 2011-04-06 19:35:39 UTC
++++ bdbxml2/bdbxml.h
+@@ -377,7 +377,7 @@
+ static inline void
+ rset_obj(VALUE obj)
+ {
+- RBASIC(obj)->klass = rb_cData;
++ RBASIC_SET_CLASS_RAW(obj, rb_cData);
+ RDATA(obj)->dfree = (RDF)free;
+ RDATA(obj)->dmark = 0;
+ }
Property changes on: trunk/databases/ruby-bdb/files/patch-bdbxml2-bdbxml.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/ruby-bdb/files/patch-docs_hashlike.rd
===================================================================
--- trunk/databases/ruby-bdb/files/patch-docs_hashlike.rd (rev 0)
+++ trunk/databases/ruby-bdb/files/patch-docs_hashlike.rd 2017-03-21 12:13:48 UTC (rev 22412)
@@ -0,0 +1,26 @@
+--- docs/hashlike.rd.orig 2011-04-06 19:35:39 UTC
++++ docs/hashlike.rd
+@@ -342,7 +342,6 @@ These are the common methods for ((|BDB:
+ --- each(set = nil, bulk = 0, "flags" => 0) { |key, value| ... }
+ --- each_pair(set = nil, bulk = 0) { |key, value| ... }
+ Iterates over associations.
+-
+ ((<set>)) ((<bulk>))
+
+ --- each_by_prefix(prefix) {|key, value| ... }
+@@ -360,7 +359,6 @@ These are the common methods for ((|BDB:
+
+ --- each_key(set = nil, bulk = 0) { |key| ... }
+ Iterates over keys.
+-
+ ((<set>)) ((<bulk>))
+
+ --- each_primary(set = nil) { |skey, pkey, pvalue| ... }
+@@ -369,7 +367,6 @@ These are the common methods for ((|BDB:
+
+ --- each_value(set = nil, bulk = 0) { |value| ... }
+ Iterates over values.
+-
+ ((<set>)) ((<bulk>))
+
+ --- empty?()
Property changes on: trunk/databases/ruby-bdb/files/patch-docs_hashlike.rd
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/ruby-bdb/files/patch-src-extconf.rb
===================================================================
--- trunk/databases/ruby-bdb/files/patch-src-extconf.rb (rev 0)
+++ trunk/databases/ruby-bdb/files/patch-src-extconf.rb 2017-03-21 12:13:48 UTC (rev 22412)
@@ -0,0 +1,23 @@
+--- src/extconf.rb.orig 2015-01-22 16:09:31 UTC
++++ src/extconf.rb
+@@ -36,16 +36,16 @@
+
+ if unknown = enable_config("unknown")
+ libs = if CONFIG.key?("LIBRUBYARG_STATIC")
+- Config::expand(CONFIG["LIBRUBYARG_STATIC"].dup).sub(/^-l/, '')
++ RbConfig::expand(CONFIG["LIBRUBYARG_STATIC"].dup).sub(/^-l/, '')
+ else
+- Config::expand(CONFIG["LIBRUBYARG"].dup).sub(/lib([^.]*).*/, '\\1')
++ RbConfig::expand(CONFIG["LIBRUBYARG"].dup).sub(/lib([^.]*).*/, '\\1')
+ end
+ unknown = find_library(libs, "ruby_init",
+- Config::expand(CONFIG["archdir"].dup))
++ RbConfig::expand(CONFIG["archdir"].dup))
+ end
+
+ inc_dir, lib_dir = dir_config("db", "/usr/include", "/usr/lib")
+-case Config::CONFIG["arch"]
++case RbConfig::CONFIG["arch"]
+ when /solaris2/
+ $DLDFLAGS ||= ""
+ $DLDFLAGS += " -R#{lib_dir}"
Property changes on: trunk/databases/ruby-bdb/files/patch-src-extconf.rb
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/ruby-bdb/files/patch-src-features.rb
===================================================================
--- trunk/databases/ruby-bdb/files/patch-src-features.rb (rev 0)
+++ trunk/databases/ruby-bdb/files/patch-src-features.rb 2017-03-21 12:13:48 UTC (rev 22412)
@@ -0,0 +1,18 @@
+--- src/features.rb.orig 2011-04-06 19:35:39 UTC
++++ src/features.rb
+@@ -813,7 +813,6 @@
+ begin
+ conftest = CONFTEST_C.dup
+ class Object
+- remove_const('CONFTEST_C')
+ end
+
+ CONFTEST_C = 'conftest.cxx'
+@@ -878,7 +877,6 @@
+
+ ensure
+ class Object
+- remove_const('CONFTEST_C')
+ end
+
+ CONFTEST_C = conftest
Property changes on: trunk/databases/ruby-bdb/files/patch-src-features.rb
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list