From owner-svn-ports-branches@FreeBSD.ORG  Mon Oct 13 17:07:45 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 93921FFF;
 Mon, 13 Oct 2014 17:07:45 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 655551D4;
 Mon, 13 Oct 2014 17:07:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9DH7jrp053508;
 Mon, 13 Oct 2014 17:07:45 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9DH7jZw053506;
 Mon, 13 Oct 2014 17:07:45 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201410131707.s9DH7jZw053506@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Mon, 13 Oct 2014 17:07:44 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r370800 - in branches/2014Q4/ports-mgmt: portupgrade
 portupgrade-devel
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Oct 2014 17:07:45 -0000

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