From owner-freebsd-ports@freebsd.org Sat Apr 20 11:57:11 2019 Return-Path: Delivered-To: freebsd-ports@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A1925158B89E for ; Sat, 20 Apr 2019 11:57:11 +0000 (UTC) (envelope-from ume@mahoroba.org) Received: from mail.mahoroba.org (ent.mahoroba.org [IPv6:2001:2f0:104:8010::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "asuka.mahoroba.org", Issuer "ca.mahoroba.org" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 84D628E68E for ; Sat, 20 Apr 2019 11:57:10 +0000 (UTC) (envelope-from ume@mahoroba.org) Received: from vsuiko.mahoroba.org (vsuiko.mahoroba.org [IPv6:2001:2f0:104:8010:a00:27ff:feb0:c2e]) (user=ume mech=DIGEST-MD5 bits=0) by mail.mahoroba.org (8.15.2/8.15.2) with ESMTPSA/inet6 id x3KBuolA095059 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NO); Sat, 20 Apr 2019 20:56:55 +0900 (JST) (envelope-from ume@mahoroba.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mahoroba.org; s=20081103; t=1555761415; bh=W0UcDycFFWESleOO0r7BR6HHcZwudQN8by8b30Ve9ZA=; h=Date:From:To:Cc:Subject:In-Reply-To:References; b=xUXEaOYL7G5PCkstu33UFkH8fC5HD7WIYZ9yHpJtMIhjn2op9Te0bTgM8Z03YCZ7k t86tqghXDecZgEEbacFVy/rMPrhMSJbxH3kEjfTOkNugO8hhFdbjxU5WpWDd+BurgK NgYJsXNSKoPCK3iQpWRcKhslY011QVFlOmWSVS/Q= Date: Sat, 20 Apr 2019 20:56:50 +0900 Message-ID: From: Hajimu UMEMOTO To: Walter Schwarzenfeld Cc: freebsd-ports@freebsd.org Subject: Re: Request to change ruby default version to 2.5 In-Reply-To: <06c269a7-d2d3-a909-8f27-04cfc8b5acab@utanet.at> References: <571f0b5c-c85e-2b4b-7409-6ed0dc7e6eaa@fechner.net> <06c269a7-d2d3-a909-8f27-04cfc8b5acab@utanet.at> User-Agent: xcite1.60> Wanderlust/2.15.9 (Almost Unreal) Emacs/26.2 Mule/6.0 (HANACHIRUSATO) X-Operating-System: FreeBSD 11.2-STABLE X-PGP-Key: http://www.mahoroba.org/~ume/publickey.asc X-PGP-Fingerprint: 1F00 0B9E 2164 70FC 6DC5 BF5F 04E9 F086 BF90 71FE MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: multipart/mixed; boundary="Multipart_Sat_Apr_20_20:56:49_2019-1" Content-Transfer-Encoding: 8bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.6.2 (mail.mahoroba.org [IPv6:2001:2f0:104:8010:0:0:0:1]); Sat, 20 Apr 2019 20:56:55 +0900 (JST) X-Virus-Scanned: clamav-milter 0.101.2 at asuka.mahoroba.org X-Virus-Status: Clean X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on asuka.mahoroba.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Apr 2019 11:57:11 -0000 --Multipart_Sat_Apr_20_20:56:49_2019-1 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit Hi, >>>>> On Sat, 20 Apr 2019 06:59:16 +0200 >>>>> Walter Schwarzenfeld said: w.schwarzenfeld> ===>>> Port directory: /usr/ports/databases/ruby-bdb w.schwarzenfeld>     ===>>> This port is marked BROKEN w.schwarzenfeld>     ===>>> does not build with Ruby 2.5 How about this patch? Sincerely, --Multipart_Sat_Apr_20_20:56:49_2019-1 Content-Type: text/plain; type=patch; charset=US-ASCII Content-Disposition: attachment; filename="ruby-bdb-ruby25.diff" Content-Transfer-Encoding: 7bit Index: Makefile =================================================================== --- Makefile (revision 499424) +++ Makefile (working copy) @@ -16,8 +16,6 @@ LICENSE= RUBY -BROKEN_RUBY25= yes - OPTIONS_DEFINE= DOCS EXAMPLES USE_RUBY= yes Index: files/patch-src-common.c =================================================================== --- files/patch-src-common.c (revision 499424) +++ files/patch-src-common.c (working copy) @@ -1,38 +1,38 @@ ---- 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 @@ +--- src/common.c.orig 2011-04-06 19:35:39 UTC ++++ src/common.c +@@ -1229,7 +1229,7 @@ bdb_s_new(int argc, VALUE *argv, VALUE o 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 ((v = rb_hash_lookup(f, rb_str_new2("txn"))) != Qnil) { if (!rb_obj_is_kind_of(v, bdb_cTxn)) { rb_raise(bdb_eFatal, "argument of txn must be a transaction"); } -@@ -1241,7 +1241,7 @@ +@@ -1241,7 +1241,7 @@ bdb_s_new(int argc, VALUE *argv, VALUE o 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)) { ++ else if ((v = rb_hash_lookup(f, rb_str_new2("env"))) != Qnil) { if (!rb_obj_is_kind_of(v, bdb_cEnv)) { rb_raise(bdb_eFatal, "argument of env must be an environnement"); } -@@ -1254,11 +1254,11 @@ +@@ -1254,11 +1254,11 @@ bdb_s_new(int argc, VALUE *argv, VALUE o #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)) { ++ if ((v = rb_hash_lookup(f, rb_intern("set_flags"))) != Qnil) { 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)) { ++ else if ((v = rb_hash_lookup(f, tmp)) != Qnil) { rb_hash_aset(f, tmp, INT2NUM(NUM2INT(v) | DB_ENCRYPT)); } else { -@@ -1570,10 +1570,10 @@ +@@ -1570,10 +1570,10 @@ bdb_init(int argc, VALUE *argv, VALUE ob #endif switch(dbst->type) { case DB_BTREE: @@ -45,7 +45,7 @@ break; case DB_RECNO: { -@@ -1581,17 +1581,17 @@ +@@ -1581,17 +1581,17 @@ bdb_init(int argc, VALUE *argv, VALUE ob rb_warning("It's hard to distinguish Recnum with Recno for all versions of Berkeley DB"); if ((count = bdb_is_recnum(dbst->dbp)) != -1) { @@ -66,7 +66,7 @@ break; #endif default: -@@ -1635,29 +1635,29 @@ +@@ -1635,29 +1635,29 @@ bdb_s_alloc(obj) dbst->options = BDB_NOT_OPEN; cl = obj; while (cl) { @@ -102,36 +102,36 @@ dbst->type = DB_UNKNOWN; break; } -@@ -3004,8 +3004,8 @@ +@@ -3004,8 +3004,8 @@ bdb_each_kvc(argc, argv, obj, sens, repl 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)) { ++ if ((g = rb_hash_lookup(f, rb_intern("flags"))) != Qnil || ++ (g = rb_hash_lookup(f, rb_str_new2("flags"))) != Qnil) { flags = NUM2INT(g); } argc--; -@@ -3323,8 +3323,8 @@ +@@ -3323,8 +3323,8 @@ bdb_clear(int argc, VALUE *argv, VALUE o 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)) { ++ if ((g = rb_hash_lookup(f, rb_intern("flags"))) != Qnil || ++ (g = rb_hash_lookup(f, rb_str_new2("flags"))) != Qnil) { flags = NUM2INT(g); } argc--; -@@ -3348,8 +3348,8 @@ +@@ -3348,8 +3348,8 @@ bdb_replace(int argc, VALUE *argv, VALUE 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)) { ++ if ((g = rb_hash_lookup(f, rb_intern("flags"))) != Qnil || ++ (g = rb_hash_lookup(f, rb_str_new2("flags"))) != Qnil) { flags = NUM2INT(g); } argc--; Index: files/patch-src-cursor.c =================================================================== --- files/patch-src-cursor.c (revision 499424) +++ files/patch-src-cursor.c (working copy) @@ -1,13 +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 @@ +--- src/cursor.c.orig 2011-04-06 19:35:39 UTC ++++ src/cursor.c +@@ -29,8 +29,8 @@ bdb_cursor(int argc, VALUE *argv, VALUE 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)) { ++ if ((g = rb_hash_lookup(f, rb_intern("flags"))) != Qnil || ++ (g = rb_hash_lookup(f, rb_str_new2("flags"))) != Qnil) { flags = NUM2INT(g); } argc--; Index: files/patch-src-recnum.c =================================================================== --- files/patch-src-recnum.c (revision 499424) +++ files/patch-src-recnum.c (working copy) @@ -1,22 +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 @@ +--- src/recnum.c.orig 2011-04-06 19:35:39 UTC ++++ src/recnum.c +@@ -17,7 +17,7 @@ bdb_recnum_init(int argc, VALUE *argv, V 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])) { ++ if (rb_hash_lookup(argv[argc - 1], sarray) != Qnil) { 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 @@ +@@ -697,8 +697,8 @@ bdb_sary_clear(int argc, VALUE *argv, VA 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)) { ++ if ((g = rb_hash_lookup(f, rb_intern("flags"))) != Qnil || ++ (g = rb_hash_lookup(f, rb_str_new2("flags"))) != Qnil) { flags = NUM2INT(g); } argc--; --Multipart_Sat_Apr_20_20:56:49_2019-1 Content-Type: text/plain; charset=US-ASCII -- Hajimu UMEMOTO ume@mahoroba.org ume@FreeBSD.org http://www.mahoroba.org/~ume/ --Multipart_Sat_Apr_20_20:56:49_2019-1--