git: bd3870067d33 - main - ports-mgmt/portupgrade*: Revert "Use databases/rubygem-dbm with Ruby 3.2"

From: Yasuhiro Kimura <yasu_at_FreeBSD.org>
Date: Mon, 31 Jul 2023 23:35:21 UTC
The branch main has been updated by yasu:

URL: https://cgit.FreeBSD.org/ports/commit/?id=bd3870067d33e4796417070d5ec6f3e00ec2f055

commit bd3870067d33e4796417070d5ec6f3e00ec2f055
Author:     Yasuhiro Kimura <yasu@FreeBSD.org>
AuthorDate: 2023-07-13 23:36:21 +0000
Commit:     Yasuhiro Kimura <yasu@FreeBSD.org>
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