From owner-svn-ports-all@freebsd.org Thu Dec 28 13:41:58 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7B048E9EAA3; Thu, 28 Dec 2017 13:41:58 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9A24F7B3FD; Thu, 28 Dec 2017 13:41:57 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBSDfuGW029988; Thu, 28 Dec 2017 13:41:56 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBSDfuaH029984; Thu, 28 Dec 2017 13:41:56 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201712281341.vBSDfuaH029984@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Thu, 28 Dec 2017 13:41:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r457454 - in head/databases/ruby-bdb: . files X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: in head/databases/ruby-bdb: . files X-SVN-Commit-Revision: 457454 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Dec 2017 13:41:58 -0000 Author: sunpoet Date: Thu Dec 28 13:41:56 2017 New Revision: 457454 URL: https://svnweb.freebsd.org/changeset/ports/457454 Log: Remove outdate RUBY_VER check With hat: ruby Added: head/databases/ruby-bdb/files/patch-src-common.c - copied unchanged from r457453, head/databases/ruby-bdb/files/extra-patch-src-common.c-22 head/databases/ruby-bdb/files/patch-src-cursor.c - copied unchanged from r457453, head/databases/ruby-bdb/files/extra-patch-src-cursor.c-22 head/databases/ruby-bdb/files/patch-src-recnum.c - copied unchanged from r457453, head/databases/ruby-bdb/files/extra-patch-src-recnum.c-22 Deleted: head/databases/ruby-bdb/files/extra-patch-src-common.c-21 head/databases/ruby-bdb/files/extra-patch-src-common.c-22 head/databases/ruby-bdb/files/extra-patch-src-cursor.c-22 head/databases/ruby-bdb/files/extra-patch-src-recnum.c-22 Modified: head/databases/ruby-bdb/Makefile Modified: head/databases/ruby-bdb/Makefile ============================================================================== --- head/databases/ruby-bdb/Makefile Thu Dec 28 13:41:50 2017 (r457453) +++ head/databases/ruby-bdb/Makefile Thu Dec 28 13:41:56 2017 (r457454) @@ -55,18 +55,6 @@ SHEBANG_FILES= examples/record.rb \ examples/basic.rb \ examples/lock.rb -.include - -.if ${RUBY_VER} == 2.1 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src-common.c-21 -.endif - -.if ${RUBY_VER} >= 2.2 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src-common.c-22 \ - ${FILESDIR}/extra-patch-src-recnum.c-22 \ - ${FILESDIR}/extra-patch-src-cursor.c-22 -.endif - post-patch: @${RM} ${WRKSRC}/docs/*.orig @@ -87,4 +75,4 @@ regression-test: build (cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test) -.include +.include Copied: head/databases/ruby-bdb/files/patch-src-common.c (from r457453, head/databases/ruby-bdb/files/extra-patch-src-common.c-22) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/ruby-bdb/files/patch-src-common.c Thu Dec 28 13:41:56 2017 (r457454, copy of r457453, head/databases/ruby-bdb/files/extra-patch-src-common.c-22) @@ -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--; Copied: head/databases/ruby-bdb/files/patch-src-cursor.c (from r457453, head/databases/ruby-bdb/files/extra-patch-src-cursor.c-22) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/ruby-bdb/files/patch-src-cursor.c Thu Dec 28 13:41:56 2017 (r457454, copy of r457453, head/databases/ruby-bdb/files/extra-patch-src-cursor.c-22) @@ -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--; Copied: head/databases/ruby-bdb/files/patch-src-recnum.c (from r457453, head/databases/ruby-bdb/files/extra-patch-src-recnum.c-22) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/ruby-bdb/files/patch-src-recnum.c Thu Dec 28 13:41:56 2017 (r457454, copy of r457453, head/databases/ruby-bdb/files/extra-patch-src-recnum.c-22) @@ -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--;