From nobody Wed Dec 7 04:37:39 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NRkzR2MSDz4jjV9; Wed, 7 Dec 2022 04:37:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NRkzR1xhwz45Zb; Wed, 7 Dec 2022 04:37:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670387859; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ES06O/K/JqTvQY/kLMm3rWtE+SITgBAayNTGtomPP40=; b=plLjHEvX6GzSb+u99Vo9PXdhmAbIeNLzh72M4sSQh9XwTu/94tCwIog6Lp6HaYCc5uBkbd xJ4SwLTv3VWM+NhQ2UoCzyN8qZ7wrcyWW+7+QquUvXNIJZTE/oX/nQLUexv2xv+rU0evwL GpdIs3PGsFoZXWX3Te6gdgav/ITJxYnWUBpLMnaB34p7xftrl5zsnWuTxZSZZAk3qIey1X xHY0fOsQkuJepmu+0pZLwI+aSAWbXvamzu77LcU+Doo8J83gM+/UM7GrvP0UbAqmF/Aw3Q /oWIybw9h2HSgHr0tMTKlWzy0bRod7oanGxY3ZKv11KxBcAyrONeohNuSpFT9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670387859; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ES06O/K/JqTvQY/kLMm3rWtE+SITgBAayNTGtomPP40=; b=wXDVniqgBMtnU3evXEpWu0Y9tVWv0w5zv9umRw1lgnLYbq8QBkxVWSP+pQwKC9fLGKeC8i fBUvNJidetElvX55iMKU2YmyGH+vo7bHEOHe4iGc9Kc4gQQQ7kY7R+w75qHmKBWpqpzEdt DsjwlUKA6Fh2t1Cokr45j71qDztmHKMuPCHwCm/NxRdpUWTyX1wO9g1haqSxXS4DJ4JNus EOY3eu97DBF5UmRjN7OU9C0wQh7D+4te64P8vmeDjFLTPc14FzUbLCtdVsoko1R31Wr5Jt 6RczbIyVEw+Eo5H35tsrhtmqQ4gXPHEOOc9SZIraJLC+oTbJQe5EQm8aKwszvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670387859; a=rsa-sha256; cv=none; b=b3VNIwSijgsU7f+tia7RzL5C/RDv8AUfJBtV6I3fCwBXOBCMqvB4OriRH+McAiamcKGLbc g6dAY+gub2sm2AfW3XKj26FQ3tvEFN277DKU+kOL31Ck2y3afZIYmHd/CaO+0ZPcIvy5v0 y790wkbPrX2Cix11+zKEXzfQ7IgUcGuZnMtcjWfSzseMypPwiarISh5RaYBz0No7DCsDOZ h+SnTHOQ0HgWLcabMrB8MHEA9PLM8pL9bcpbXLvRK4kxzS2jBh/9q5sgjkoYR0jbBO/Lkc fX+gDMau8wUGc6DZ8NQdZtYti9J2N4Mr3vnr2gnx8ctHH/B+H1z990swY+hAag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NRkzR13R9z13Y7; Wed, 7 Dec 2022 04:37:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2B74bda2015861; Wed, 7 Dec 2022 04:37:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B74bdC2015860; Wed, 7 Dec 2022 04:37:39 GMT (envelope-from git) Date: Wed, 7 Dec 2022 04:37:39 GMT Message-Id: <202212070437.2B74bdC2015860@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: 71e3954d6eaa - main - databases/rubygem-dbm: Fix build with Berkeley DB 18.x List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 71e3954d6eaaedf2d90bd2c7896dd24b702022ce Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=71e3954d6eaaedf2d90bd2c7896dd24b702022ce commit 71e3954d6eaaedf2d90bd2c7896dd24b702022ce Author: Yasuhiro Kimura AuthorDate: 2022-12-07 04:00:28 +0000 Commit: Yasuhiro Kimura CommitDate: 2022-12-07 04:36:32 +0000 databases/rubygem-dbm: Fix build with Berkeley DB 18.x MFH: 2022Q4 --- .../rubygem-dbm/files/patch-ext_dbm_extconf.rb | 40 +++++++++++++++------- 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/databases/rubygem-dbm/files/patch-ext_dbm_extconf.rb b/databases/rubygem-dbm/files/patch-ext_dbm_extconf.rb index de340a4c8bd1..96631779f6e4 100644 --- a/databases/rubygem-dbm/files/patch-ext_dbm_extconf.rb +++ b/databases/rubygem-dbm/files/patch-ext_dbm_extconf.rb @@ -1,24 +1,31 @@ ---- ext/dbm/extconf.rb.orig 2019-12-01 06:24:29 UTC +--- ext/dbm/extconf.rb.orig 2022-12-07 02:13:27 UTC +++ ext/dbm/extconf.rb -@@ -24,7 +24,7 @@ dir_config("dbm") +@@ -7,6 +7,7 @@ + # db Berkeley DB (libdb) + # db2 Berkeley DB (libdb2) + # db1 Berkeley DB (libdb1) ++# db18 Berkeley DB (libdb18) + # db6 Berkeley DB (libdb6) + # db5 Berkeley DB (libdb5) + # db4 Berkeley DB (libdb4) +@@ -24,7 +25,7 @@ dir_config("dbm") if dblib = with_config("dbm-type", nil) dblib = dblib.split(/[ ,]+/) else - dblib = %w(libc db db2 db1 db6 db5 db4 db3 gdbm_compat gdbm qdbm) -+ dblib = %w(libc db db2 db1 db6 db5 db48 db3 gdbm_compat gdbm qdbm) ++ dblib = %w(libc db db2 db1 db18 db6 db5 db4 db3 gdbm_compat gdbm qdbm) end headers = { -@@ -33,7 +33,7 @@ headers = { - "db1" => ["db1/ndbm.h", "db1.h", "ndbm.h"], - "db2" => ["db2/db.h", "db2.h", "db.h"], - "db3" => ["db3/db.h", "db3.h", "db.h"], -- "db4" => ["db4/db.h", "db4.h", "db.h"], -+ "db48" => ["db48/db.h", "db4.h", "db.h"], +@@ -36,6 +37,7 @@ headers = { + "db4" => ["db4/db.h", "db4.h", "db.h"], "db5" => ["db5/db.h", "db5.h", "db.h"], "db6" => ["db6/db.h", "db6.h", "db.h"], ++ "db18" => ["db18/db.h", "db18.h", "db.h"], "gdbm_compat" => ["gdbm-ndbm.h", "gdbm/ndbm.h", "ndbm.h"], # GDBM since 1.8.1 -@@ -127,6 +127,19 @@ end + "gdbm" => ["gdbm-ndbm.h", "gdbm/ndbm.h", "ndbm.h"], # GDBM until 1.8.0 + "qdbm" => ["qdbm/relic.h", "relic.h"], +@@ -127,13 +129,27 @@ end def headers.db_check2(db, hdr) @@ -27,9 +34,10 @@ + "db1" => "db1", + "db2" => "db2", + "db3" => "db3", -+ "db48" => "db-4.8", ++ "db4" => "db4", + "db5" => "db-5", + "db6" => "db-6", ++ "db18" => "db-18", + "gdbm_compat" => "gdbm_compat", + "gdbm" => "gdbm", + "qdbm" => "qdbm", @@ -38,7 +46,15 @@ $defs.push(%{-DRUBYDBM_DBM_HEADER='"#{hdr}"'}) $defs.push(%{-DRUBYDBM_DBM_TYPE='"#{db}"'}) -@@ -147,7 +160,7 @@ def headers.db_check2(db, hdr) + hsearch = nil + + case db +- when /^db[2-6]?$/ ++ when /^db([2-6]|18)?$/ + hsearch = "-DDB_DBM_HSEARCH" + when "gdbm_compat" + have_library("gdbm") or return false +@@ -147,7 +163,7 @@ def headers.db_check2(db, hdr) # 4.3BSD original ndbm is contained in libc. # 4.4BSD (and its derivatives such as NetBSD) contains Berkeley DB 1 in libc. if !(db == 'libc' ? have_func('dbm_open("", 0, 0)', hdr, hsearch) :