From nobody Mon Jul 31 23:35:21 2023 X-Original-To: dev-commits-ports-main@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 4RFFRs6YR8z4pbdq; Mon, 31 Jul 2023 23:53:12 +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 4RFF3H3sW8z3rV1; Mon, 31 Jul 2023 23:35:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690846523; 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=+3kTF5l3MKXVWREEgZMyrC05cRxDDzJBwOOwq+gEN1Q=; b=ImAEKAMJyyingAgMhfBbf72REo+hFeNaJfX+0BxdFL8itFI8C3PAE5LfC9248VWHQWkU7W skYAFG54bOY82/yzGy1GCic4mzxuC8jGRhCP5o5n30uARPyBJC4dFxUsmng5tkmyNgKaDv qqHOYGA/+ejy+cR6Ot/H5yrbOJuz38UO7euBd3LyQGKBExtQBHbd2lChsIiKbUG5wUF7Z/ Sc4ejNGugAI207TCezn6hBA5Fgu+PxG/rpOkalxlI5lbkm/8UbTE660ICAEGw2/tRS7Eql GdW60IKgRN/hFCcjwjSK8lZO2yrn6JShDyKtEOSDJ4ybT0lcxOnJYGoSA9b7WQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690846523; 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=+3kTF5l3MKXVWREEgZMyrC05cRxDDzJBwOOwq+gEN1Q=; b=FUd8lxZzb7Bix1YfVMOoBLF7PC+gs2s7CGqQnXuCY0kKkw1grzwvCK0zaZnIAJPb+wva0S MJoWARzAu4hholG9QLI0MC4YT484ATLw5dbcQUn7AFkxn/qMV0I06zreWBf3sJCoCu9O8J lPnsy6jOPxNlVirRh0XX3MEgUTIXeouoQlo1YzLqiuCfRxgYjGgk3G3nfVSiUi3eKcheUd xprwNYGNTo41GHHPxpNrGxez2BRWKVrlk5nih7w1VJOW0LaUNqb3jmx9pGi0DbS7uqD+2Z KmB9WVHKacWYrgBnxLf6w180CJMIl6R8APzgqfH/M4Pt+mLoroMSsU3txEfOfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690846523; a=rsa-sha256; cv=none; b=yJi5pdzguxvm1Pw1dPMIeznYyX6VR6MP/cL6iVGjx8Fi7lA6TbwyM+csxiKlRpjVXVLDG7 45XD9rkkpQKzr2tnQHmRc4BBCSDQigHNfB7vpLnMrLcLIHMTSfuWCOwvOOP0zkAdHupek7 oioaAHC/WVdxKtkNUsPEQh8aEREF1TjuT7QfTiWVlFEquOEZpld4aRnHw7pRNZLqO28S5C 5xa7gfd4VeggCQrIBfKZCuYE566DQnxSj6/PQ4GzBhWEUX2PYA6oWHUzcrt2SphMnmE3pY vIuAGphTHJuXPtU7vAlKwaxUd0ShEY7rxb4+yNXvchYooK2CjCLwHhJl7AXjUw== 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 4RFF3G0GJnzFhD; Mon, 31 Jul 2023 23:35:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36VNZLpH073397; Mon, 31 Jul 2023 23:35:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36VNZLUN073396; Mon, 31 Jul 2023 23:35:21 GMT (envelope-from git) Date: Mon, 31 Jul 2023 23:35:21 GMT Message-Id: <202307312335.36VNZLUN073396@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: bd3870067d33 - main - ports-mgmt/portupgrade*: Revert "Use databases/rubygem-dbm with Ruby 3.2" List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: bd3870067d33e4796417070d5ec6f3e00ec2f055 Auto-Submitted: auto-generated The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=bd3870067d33e4796417070d5ec6f3e00ec2f055 commit bd3870067d33e4796417070d5ec6f3e00ec2f055 Author: Yasuhiro Kimura AuthorDate: 2023-07-13 23:36:21 +0000 Commit: Yasuhiro Kimura CommitDate: 2023-07-31 23:34:41 +0000 ports-mgmt/portupgrade*: Revert "Use databases/rubygem-dbm with Ruby 3.2" This reverts commit 2a325f4cc52c8565348304a9a24a2975ecaaeedd. With commit 5ebb18384791 database/ruby-bdb works fine with all supported ruby versions. So always use it as RUN_DEPENDS again. PR: 272491 Approved by: maintainer timeout --- ports-mgmt/portupgrade-devel/Makefile | 7 +------ ports-mgmt/portupgrade/Makefile | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile index 79470ab216d7..00b494592253 100644 --- a/ports-mgmt/portupgrade-devel/Makefile +++ b/ports-mgmt/portupgrade-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= portupgrade PORTVERSION= 20180309 -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 3 CATEGORIES= ports-mgmt MASTER_SITES= GH \ @@ -39,13 +39,8 @@ 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 f9a899bb78f4..3ea3d7e0f20c 100644 --- a/ports-mgmt/portupgrade/Makefile +++ b/ports-mgmt/portupgrade/Makefile @@ -1,6 +1,6 @@ PORTNAME= portupgrade PORTVERSION= 2.4.16 -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= ports-mgmt MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \ @@ -38,13 +38,8 @@ 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