Skip to content

Commit

Permalink
ports-mgmt/portupgrade*: Revert "Use databases/rubygem-dbm with Ruby …
Browse files Browse the repository at this point in the history
…3.2"

This reverts commit 2a325f4.

With commit 5ebb183 database/ruby-bdb works fine with all
supported ruby versions. So always use it as RUN_DEPENDS again.

PR:		272491
Approved by:	maintainer timeout
  • Loading branch information
Yasuhiro Kimura authored and Yasuhiro Kimura committed Jul 31, 2023
1 parent 8d0309e commit bd38700
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 12 deletions.
7 changes: 1 addition & 6 deletions 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 \
Expand Down Expand Up @@ -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
Expand Down
7 changes: 1 addition & 6 deletions 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}/ \
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit bd38700

Please sign in to comment.