From owner-svn-ports-head@FreeBSD.ORG Sun Mar 17 22:04:02 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id F1DD3C4F; Sun, 17 Mar 2013 22:04:01 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id B109F604; Sun, 17 Mar 2013 22:04:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2HM40Gt070232; Sun, 17 Mar 2013 22:04:00 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2HM402n070230; Sun, 17 Mar 2013 22:04:00 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201303172204.r2HM402n070230@svn.freebsd.org> From: Bryan Drewery Date: Sun, 17 Mar 2013 22:04:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r314498 - in head/ports-mgmt: portupgrade portupgrade-devel X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Mar 2013 22:04:02 -0000 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