From nobody Thu Jan 05 09:58:16 2023 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 4Nnhk11sNTz2p2wq; Thu, 5 Jan 2023 09:58:17 +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 4Nnhk11HNBz3Gf0; Thu, 5 Jan 2023 09:58:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672912697; 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=g8zeLd/IV7tjBpSvM3xQXx35FiFNu1XFLJehsKeOI+Y=; b=Mg9i7xC5GADWKVKECBHW5fjzoCY4iNgS5gfQTtHUHv2fK0VeiFGSybYzoTbGk7xrMaG/1C 0goYt1meEc2upNOVcyX6XrZ+Apx28FG5dPcZrfUjtfe7hZQuKdnFnNRe1A/Rf1C+PwOhCl xT0JYjqdDsnv/ApT4gc4D3x/AB4kGbuoPLeEq59GXjdxBRW+KYDCuyFewizrIrWqNfUJRk OeIUNPpopuVJFBfJ84EZ7+5UH5L+mXDxEPaEP4tM8WaXgAln03WD1MzlZrPixaLMHSqxN7 XCPI/lVFBlSZfgiaXA6QPLJf4L2Y78yzbGNzwYDSKWEsTnI0nmSL9cbl8Wa58Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672912697; 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=g8zeLd/IV7tjBpSvM3xQXx35FiFNu1XFLJehsKeOI+Y=; b=h+321r2duQZioSk+m5sZ+IOvNligMuZtfFYDTQgGdeWyyH1cCBzizJ+mcWP1Mkiqjk0BAS AgEgvM5zcphZh7Yl21Ehu3QT2Wz2RtuTppdurZEGE3GpRU2xk3fusn3uiRYur3x6qeGHYX DxkHHpuj0XldfFz40Uku/0L3zQD+sPiZqMHSvOV7PeeIUK513Nmc5EKhUEnNJQrAA/ciJE HDBp41ki97FrGUpVvAiIwygUS3atDOvoNxyXN+uG9Ei/Nh46wW4PCFArtSeH3P0Nwzsps/ pjeQTnmOSaF1V1Soa9Lg3iZKtT/wips8TUpDpY+qEWucuFmuvJ11QGsi1ovZew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672912697; a=rsa-sha256; cv=none; b=bkQ4NYy7CpxwP7GQBUNAyKZy4e5zdXpTIRDRfOfg6FGdCNxy0TIl3m/L52bx/vNPpzOEoQ CEW76HwLKN9daj9ptQZ6W0a9VfwZj5x2rU0UasZJ1fITEhx8V6hoc0HvL8z8mzUishkjFl Qg+d2vPVR3zWyaH9A1yA/3zA54xRq+ZJ6LFYOtJFroMZaFoWF8aDBcYvunsxyp1FZXs+x7 zBfdeSUiJ8nTYEvxqzweoRobXCH9+2+VdrWUZ9m+3u2YgaMVWhhgfHc2XjWAEfNK66cNH9 n47VT33amUfg5U1VkZn68h3SCH0E0rAM5juzFJlIJRMqsIClfNUgKlQdTcqo8w== 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 4Nnhk10NPxzmgd; Thu, 5 Jan 2023 09:58:17 +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 3059wGZF047032; Thu, 5 Jan 2023 09:58:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3059wGT9047031; Thu, 5 Jan 2023 09:58:16 GMT (envelope-from git) Date: Thu, 5 Jan 2023 09:58:16 GMT Message-Id: <202301050958.3059wGT9047031@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: 2ae69a84fb6d - 2023Q1 - ports-mgmt/portupgrade*: Use databases/rubygem-dbm with Ruby 3.2 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/2023Q1 X-Git-Reftype: branch X-Git-Commit: 2ae69a84fb6da488fa455cb305b96efd7670f4a6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q1 has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=2ae69a84fb6da488fa455cb305b96efd7670f4a6 commit 2ae69a84fb6da488fa455cb305b96efd7670f4a6 Author: Yasuhiro Kimura AuthorDate: 2022-12-06 20:30:17 +0000 Commit: Yasuhiro Kimura CommitDate: 2023-01-05 09:57:56 +0000 ports-mgmt/portupgrade*: Use databases/rubygem-dbm with Ruby 3.2 databases/ruby-bdb is BROKEN with Ruby 3.2. PR: 268207 Approved by: maintainer timeout MFH: 2023Q1 (cherry picked from commit 2a325f4cc52c8565348304a9a24a2975ecaaeedd) --- ports-mgmt/portupgrade-devel/Makefile | 5 +++++ ports-mgmt/portupgrade/Makefile | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile index 1abdc7f2ef4e..44aaa0892fe9 100644 --- a/ports-mgmt/portupgrade-devel/Makefile +++ b/ports-mgmt/portupgrade-devel/Makefile @@ -40,8 +40,13 @@ INSTALL_TARGET= install INSTALL_TARGET+= install-doc .endif +.if ${RUBY_VER} >= 3.2 +# databases/ruby-bdb is BROKEN with Ruby 3.2 +RUN_DEPENDS+= rubygem-dbm>0:databases/rubygem-dbm +.else # For PKG_DBDRIVER={bdb_btree,bdb_hash} RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/bdb.so:databases/ruby-bdb +.endif regression-test: patch cd ${WRKSRC} && ${MAKE} test diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile index b4a8be928994..4fc1e8e6b928 100644 --- a/ports-mgmt/portupgrade/Makefile +++ b/ports-mgmt/portupgrade/Makefile @@ -39,8 +39,13 @@ INSTALL_TARGET= install INSTALL_TARGET+= install-doc .endif +.if ${RUBY_VER} >= 3.2 +# databases/ruby-bdb is BROKEN with Ruby 3.2 +RUN_DEPENDS+= rubygem-dbm>0:databases/rubygem-dbm +.else # For PKG_DBDRIVER={bdb_btree,bdb_hash} RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/bdb.so:databases/ruby-bdb +.endif post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/compat/pkg