svn commit: r314498 - in head/ports-mgmt: portupgrade portupgrade-devel

[Bryan Drewery]

Author: bdrewery
Date: Sun Mar 17 22:04:00 2013
New Revision: 314498
URL: http://svnweb.freebsd.org/changeset/ports/314498

Log:
  - 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

Modified:
  head/ports-mgmt/portupgrade-devel/Makefile
  head/ports-mgmt/portupgrade/Makefile

Modified: head/ports-mgmt/portupgrade-devel/Makefile
==============================================================================
--- head/ports-mgmt/portupgrade-devel/Makefile	Sun Mar 17 21:07:44 2013	(r314497)
+++ head/ports-mgmt/portupgrade-devel/Makefile	Sun Mar 17 22:04:00 2013	(r314498)
@@ -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 manageme
 
 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

Modified: head/ports-mgmt/portupgrade/Makefile
==============================================================================
--- head/ports-mgmt/portupgrade/Makefile	Sun Mar 17 21:07:44 2013	(r314497)
+++ head/ports-mgmt/portupgrade/Makefile	Sun Mar 17 22:04:00 2013	(r314498)
@@ -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