From owner-svn-ports-head@FreeBSD.ORG Thu Jan 24 20:47:18 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 62F2A6D8; Thu, 24 Jan 2013 20:47:18 +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 2784C3FF; Thu, 24 Jan 2013 20:47:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0OKlIAR078941; Thu, 24 Jan 2013 20:47:18 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0OKlIuu078940; Thu, 24 Jan 2013 20:47:18 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201301242047.r0OKlIuu078940@svn.freebsd.org> From: Bryan Drewery Date: Thu, 24 Jan 2013 20:47:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r310944 - head/ports-mgmt/portupgrade 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: Thu, 24 Jan 2013 20:47:18 -0000 Author: bdrewery Date: Thu Jan 24 20:47:17 2013 New Revision: 310944 URL: http://svnweb.freebsd.org/changeset/ports/310944 Log: - Remove optional dependency on databases/ruby-bdb1 as there is really no compelling reason to keep it. It just adds confusion. Portupgrade should gracefully handle rebuilding the pkgdb now if the bdb backend changes because of this. If not just force rebuild: pkgdb -uf - Make databases/ruby-bdb the unconditional db backend Modified: head/ports-mgmt/portupgrade/Makefile Modified: head/ports-mgmt/portupgrade/Makefile ============================================================================== --- head/ports-mgmt/portupgrade/Makefile Thu Jan 24 19:46:50 2013 (r310943) +++ head/ports-mgmt/portupgrade/Makefile Thu Jan 24 20:47:17 2013 (r310944) @@ -3,6 +3,7 @@ PORTNAME= portupgrade PORTVERSION= 2.4.10.4 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= ports-mgmt MASTER_SITES= SF/portupgrade/pkgtools/dist/ \ @@ -14,13 +15,7 @@ COMMENT= FreeBSD ports/packages administ LICENSE= BSD -NO_OPTIONS_SORT= yes OPTIONS_DEFINE= DOCS -OPTIONS_RADIO= DB_OVERRIDE -OPTIONS_RADIO_DB_OVERRIDE= BDB4 BDB1 -OPTIONS_DEFAULT= BDB4 DOCS -BDB1_DESC= Use Berkeley DB 1 -BDB4_DESC= Use Berkeley DB >=2 CONFLICTS_INSTALL= portupgrade-devel-* @@ -59,13 +54,8 @@ INSTALL_TARGET= install INSTALL_TARGET+= install-doc .endif -.if ${PORT_OPTIONS:MBDB4} # For PKG_DBDRIVER={bdb_btree,bdb_hash} RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/bdb.so:${PORTSDIR}/databases/ruby-bdb -.elif ${PORT_OPTIONS:MBDB1} -# For PKG_DBDRIVER={bdb1_btree,bdb1_hash} -RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/bdb1.so:${PORTSDIR}/databases/ruby-bdb1 -.endif # parsedate is needed for date globbing .if ${RUBY_VER} == 1.9 @@ -80,15 +70,6 @@ MAKE_ENV+= NEED_COMPAT_SCRIPT=yes PLIST_SUB+= SCRIPT="@comment " .endif -pre-extract: -.if exists(${RUBY_SITEARCHLIBDIR}/bdb.so) && ${PORT_OPTIONS:MBDB1} - @${ECHO_MSG} "=================================================================" - @${ECHO_MSG} "BDB1 is defined but databases/ruby-bdb port installed." - @${ECHO_MSG} "Remove ruby-bdb or redefine options." - @${ECHO_MSG} "=================================================================" - @exit 1 -.endif - post-install: if [ ! -f ${PREFIX}/etc/pkgtools.conf ]; then \ ${CP} -p ${PREFIX}/etc/pkgtools.conf.sample ${PREFIX}/etc/pkgtools.conf; \