From nobody Thu Jan 05 09:56:20 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 4Nnhgn0Xz5z2p2lK; Thu, 5 Jan 2023 09:56:21 +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 4Nnhgm63TWz3GDc; Thu, 5 Jan 2023 09:56:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672912580; 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=TKerMziYs1gFbf3t6nvXAgvZk6PogZv6asgvy+RjxhM=; b=I1wA3Pqd5e60lGfcSO/2K67BGe2MRMKIESEKhwdqiUOX1Ce24+4TjQm0CJY+hRr2o8id1O 3HgQIPhiK99MuDZgNBJQynMCZlQmur7L7THD7qlXCv9aHWrpxJwpEIIO/3qAvlPEbU2QPn 8uX/kW0Ah6G77uGMkI39nh94+lpJdgqtWcDclTcrGgBahiUEcl2+tee2dvU45Gavv/e8ou W493zwerzFVE5fvQ4KYvH3AjNciSIWQ7nu4tdbLAJZduwmRyp9PD1wCpy6+nktfM1FnrGc Ezc5bDFAQ4eYJxc0BB1Iu0qX0si3jvDgkupb/gq+QXNYFF4ofoSrkE/Qud2ZzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672912580; 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=TKerMziYs1gFbf3t6nvXAgvZk6PogZv6asgvy+RjxhM=; b=jez7fWgKY9iKTNRZWAL5LqguqXjLUbIYNb+JrfEQNIHNOntCYaIjzcV1mqy9ZqG+rjD2Gd bZrjP2HXQkJWo4tI1SPAZBwEW+kU9JugJsH+/f+kO0r5YMtevnIHwMNgk1TiatSLFAtnQz sM0CDGzSI8Rv7XtgwicvbuYl+Oel35X8sSIMsjHd7KRhWXqpmCdicBok1slxvErNVZ0k+x 1Tad3f2BV4GTQC+K7JmFUvyENlgJbEXqH+db4oPADDH8x63XYOF/H06UUh07TqTyUdKNmb gzu3hj5LXOaKGKccmvYg4HRZg2ojR6OxGQvRHx+rsAWokZe9U+VJwRUU3CRc2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672912580; a=rsa-sha256; cv=none; b=hqVWSMZVAkCxQl4+fzgfhGjjdjLY/9R468fNWNMcFtT/OAmszkr2U2BDfMiWP/3fBstG00 Ay+s7VTV/DbYNQJ8Z7OJQz7g21oYllXhw1fXZkMap4gtN53+ZHLrXA6e8cV3dXGKKqt+h8 WENs6VZkVaUQXMvjJWpucKRu4ZSnGPw08EkfOV/0VPgQfaz8kYXXYp8EmoWi0ngXgBA8MT KYjD7HxOwDV71//vpHrmfR6SF65oE0LSPWzdtWJCLc09Vs0bqfnGvJiHF3Rf0ZcOOUH62v +IkcwGgOrc0trGrf+uOC0ZtQ50AvRBl8jVA/tjXyOrrIU6t4/fYJZKvXs6neAw== 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 4Nnhgm58X2zmMY; Thu, 5 Jan 2023 09:56:20 +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 3059uKPE046588; Thu, 5 Jan 2023 09:56:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3059uKW6046587; Thu, 5 Jan 2023 09:56:20 GMT (envelope-from git) Date: Thu, 5 Jan 2023 09:56:20 GMT Message-Id: <202301050956.3059uKW6046587@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: 2a325f4cc52c - main - 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/main X-Git-Reftype: branch X-Git-Commit: 2a325f4cc52c8565348304a9a24a2975ecaaeedd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=2a325f4cc52c8565348304a9a24a2975ecaaeedd commit 2a325f4cc52c8565348304a9a24a2975ecaaeedd Author: Yasuhiro Kimura AuthorDate: 2022-12-06 20:30:17 +0000 Commit: Yasuhiro Kimura CommitDate: 2023-01-05 09:55:42 +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 --- 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