From nobody Wed Dec 7 04:39:57 2022 X-Original-To: dev-commits-ports-branches@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 4NRl252MSbz4jjWx; Wed, 7 Dec 2022 04:39:57 +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 4NRl251rRFz45gP; Wed, 7 Dec 2022 04:39:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670387997; 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=lTWY9Q+jRt+5Gluu1NMsDjpBooaaiG5yXXaI3s9HPC0=; b=fpZ9zp2vs16r5pE1y6JXc2IdIPbav+T3yXQ5TWFUhzfYXIadaf5tbIr+HTHt1cUPm886ZH o6JnST3E4T1FjLEqBAf3hK7ENCjAMhQdzxKDc4dRYMWDUeE6iUcOW5Eyer8V4N/Ef+GHb+ Nd/IldApVwM9pRxATpRRfiipixCMuS6E03SAe0JOVxd127BEXNEhON9GuhAjJAVomKSy/p EgkP9+ZJW7HzzH1eKfKzZuywb/M8ZFusbaPRf4gheqjiJd5BWwoxd9nV2GhEhjXYdU4Ydv XTuFxIrr+ikUM1tXqyeeROpVi75cuCP/aFDGVkGz6IrT9YeV6mv8ThG8zaf63Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670387997; 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=lTWY9Q+jRt+5Gluu1NMsDjpBooaaiG5yXXaI3s9HPC0=; b=eHMdVzxofcgwb10EtcBy+UrPGZWr6FPKeN9wTVmF5tvwyBHg0v0Gm2L3ezbIIQyhY47uXF xmNAJskQ0yuK3LBiZly0LF5yVvfVwRaLwL+kpTTfEOZ7GqzxavJQ7DSV5WA27HIMGoQp8u AZnS0fHhP2eYT/sUzEZhAP+QPphYq+f0ZblJZLV+i0KRoqe9xW7ZUe3HVjMqvej9535ZqX axanM1YaxW7Ip9V00w33oyknveYutQr+ocVhqC+kVSOPnYOFl/a8wxkW3PqLR96k0hruo3 AM7OLQ1OcS+Otdayu8q0p7+s7Ll0ksgKF+bdsyzaDLOSsaMFwIHfCSu8Sb5jhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670387997; a=rsa-sha256; cv=none; b=pk+G7P+vUrH9ZPanSZ2gdZebcAmoKQqmOyKocMfS5Li9DHhGciezy8U2NixSCbe3ZAL7pa rlLVwkgfHalDGc/R5nijpwX6xVSeYcx94Ys7kiBTxRsZajjjzGhu4/G9Xsblj9JuWVD+Ev b4IfitOJyfpNgsQb5AJzrd61tbl72CBj3w+2jbzcw0rRfrEs5TXVVOnzCVR7UW44Iy8mzJ 48zdyc2Bqfsy3Lju3Muva8GuqLyisMCs6ZSo2U7vLyqmIwRUBPSbLlnIaJsnAN1CpnhCOR Yy8WLbrolQquncCXvgo7CZWd9Pbi2vT+BqeM0sBH+9YlAN8nDC7qMnRzUKzn9A== 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 4NRl250sMCz148R; Wed, 7 Dec 2022 04:39:57 +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 2B74dvCR016210; Wed, 7 Dec 2022 04:39:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B74dvqo016209; Wed, 7 Dec 2022 04:39:57 GMT (envelope-from git) Date: Wed, 7 Dec 2022 04:39:57 GMT Message-Id: <202212070439.2B74dvqo016209@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yasuhiro Kimura Subject: git: 1afa9289812f - 2022Q4 - databases/rubygem-dbm: Fix build with Berkeley DB 18.x List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2022Q4 X-Git-Reftype: branch X-Git-Commit: 1afa9289812fdce10eda7c0c95c0bc43a4b131c1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q4 has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=1afa9289812fdce10eda7c0c95c0bc43a4b131c1 commit 1afa9289812fdce10eda7c0c95c0bc43a4b131c1 Author: Yasuhiro Kimura AuthorDate: 2022-12-07 04:00:28 +0000 Commit: Yasuhiro Kimura CommitDate: 2022-12-07 04:39:38 +0000 databases/rubygem-dbm: Fix build with Berkeley DB 18.x MFH: 2022Q4 (cherry picked from commit 71e3954d6eaaedf2d90bd2c7896dd24b702022ce) --- .../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) :