svn commit: r370800 - in branches/2014Q4/ports-mgmt: portupgrade portupgrade-devel

[Bryan Drewery]

Author: bdrewery
Date: Mon Oct 13 17:07:44 2014
New Revision: 370800
URL: https://svnweb.freebsd.org/changeset/ports/370800
QAT: https://qat.redports.org/buildarchive/r370800/

Log:
  MFH: r370790
  
  - Add dependency back for ruby-bdb for Ruby 2.0.
  
  PR:		188084
  PR:		185523

Modified:
  branches/2014Q4/ports-mgmt/portupgrade-devel/Makefile
  branches/2014Q4/ports-mgmt/portupgrade/Makefile
Directory Properties:
  branches/2014Q4/   (props changed)

Modified: branches/2014Q4/ports-mgmt/portupgrade-devel/Makefile
==============================================================================
--- branches/2014Q4/ports-mgmt/portupgrade-devel/Makefile	Mon Oct 13 17:07:22 2014	(r370799)
+++ branches/2014Q4/ports-mgmt/portupgrade-devel/Makefile	Mon Oct 13 17:07:44 2014	(r370800)
@@ -3,7 +3,7 @@
 
 PORTNAME=	portupgrade
 PORTVERSION=	20141006
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	3
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	GH \
@@ -44,10 +44,8 @@ INSTALL_TARGET=		install
 INSTALL_TARGET+=	install-doc
 .endif
 
-# Reported that ruby-bdb is BROKEN with 2.0
-.if ${RUBY_VER} != 2.0 && ${RUBY_VER} != 2.1
+# For PKG_DBDRIVER={bdb_btree,bdb_hash}
 RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/bdb.so:${PORTSDIR}/databases/ruby-bdb
-.endif
 
 regression-test: patch
 	cd ${WRKSRC} && ${MAKE} test

Modified: branches/2014Q4/ports-mgmt/portupgrade/Makefile
==============================================================================
--- branches/2014Q4/ports-mgmt/portupgrade/Makefile	Mon Oct 13 17:07:22 2014	(r370799)
+++ branches/2014Q4/ports-mgmt/portupgrade/Makefile	Mon Oct 13 17:07:44 2014	(r370800)
@@ -3,7 +3,7 @@
 
 PORTNAME=	portupgrade
 PORTVERSION=	2.4.13
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	SF/portupgrade/pkgtools/dist/ \
@@ -39,11 +39,8 @@ INSTALL_TARGET=		install
 INSTALL_TARGET+=	install-doc
 .endif
 
-# Reported that ruby-bdb is BROKEN with 2.0
-.if ${RUBY_VER} != 2.0 && ${RUBY_VER} != 2.1
 # For PKG_DBDRIVER={bdb_btree,bdb_hash}
 RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/bdb.so:${PORTSDIR}/databases/ruby-bdb
-.endif
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/compat/pkg