diff options
author | Bryan Drewery <bdrewery@FreeBSD.org> | 2013-03-17 22:04:00 +0000 |
---|---|---|
committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2013-03-17 22:04:00 +0000 |
commit | 40dd6cf483699d2e33af03731ded472903927284 (patch) | |
tree | 63fbc5a7ecd81ba60391901bb7b22bc067c0725f /ports-mgmt | |
parent | - Update to 3.6.1 (diff) |
- Don't use ruby-bdb with ruby 2.0 as it is currently
broken. Fallback on dbm_hash for now.
Reported by: Jeroen Ruigrok van der Werven
Notes
Notes:
svn path=/head/; revision=314498
Diffstat (limited to 'ports-mgmt')
-rw-r--r-- | ports-mgmt/portupgrade-devel/Makefile | 8 | ||||
-rw-r--r-- | ports-mgmt/portupgrade/Makefile | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile index 5cf117f9bec5..f044fe33cb6c 100644 --- a/ports-mgmt/portupgrade-devel/Makefile +++ b/ports-mgmt/portupgrade-devel/Makefile @@ -3,6 +3,7 @@ PORTNAME= portupgrade PORTVERSION= 20130313 +PORTREVISION= 1 PORTEPOCH= 3 CATEGORIES= ports-mgmt MASTER_SITES= GH \ @@ -15,8 +16,6 @@ COMMENT= FreeBSD ports/packages management tool (devel version) LICENSE= BSD -RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/bdb.so:${PORTSDIR}/databases/ruby-bdb - CONFLICTS_INSTALL= portupgrade-[0-9]* USE_GITHUB= yes @@ -56,6 +55,11 @@ INSTALL_TARGET= install INSTALL_TARGET+= install-doc .endif +# Reported that ruby-bdb is BROKEN with 2.0 +.if ${RUBY_VER} != 2.0 +RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/bdb.so:${PORTSDIR}/databases/ruby-bdb +.endif + # parsedate is needed for date globbing .if ${RUBY_VER} == 1.9 RUN_DEPENDS+= ${RUBY_SITELIBDIR}/parsedate.rb:${PORTSDIR}/devel/ruby-date2 diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile index c49866cda6da..37c1c0b2e095 100644 --- a/ports-mgmt/portupgrade/Makefile +++ b/ports-mgmt/portupgrade/Makefile @@ -3,6 +3,7 @@ PORTNAME= portupgrade PORTVERSION= 2.4.10.5 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= ports-mgmt MASTER_SITES= SF/portupgrade/pkgtools/dist/ \ @@ -53,8 +54,11 @@ INSTALL_TARGET= install INSTALL_TARGET+= install-doc .endif +# Reported that ruby-bdb is BROKEN with 2.0 +.if ${RUBY_VER} != 2.0 # For PKG_DBDRIVER={bdb_btree,bdb_hash} RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/bdb.so:${PORTSDIR}/databases/ruby-bdb +.endif # parsedate is needed for date globbing .if ${RUBY_VER} == 1.9 |