svn commit: r310944 - head/ports-mgmt/portupgrade

[Bryan Drewery]

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; \