From owner-svn-ports-head@freebsd.org  Thu Jun 16 13:21:08 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2ACC4A47C90;
 Thu, 16 Jun 2016 13:21:08 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 EC1791276;
 Thu, 16 Jun 2016 13:21:07 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5GDL7WD075497;
 Thu, 16 Jun 2016 13:21:07 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5GDL70X075496;
 Thu, 16 Jun 2016 13:21:07 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201606161321.u5GDL70X075496@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org
 using -f
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Thu, 16 Jun 2016 13:21:07 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r416964 - head/Mk/Uses
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.22
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Jun 2016 13:21:08 -0000

Author: mat
Date: Thu Jun 16 13:21:06 2016
New Revision: 416964
URL: https://svnweb.freebsd.org/changeset/ports/416964

Log:
  Fix USES=bdb.
  
  Turns out that the conversion to USES was broken, and did not take the
  DEFAULT_VERSIONS=bdb=foo into account.
  
  PR:		210149
  Submitted by:	mat
  Exp-run by:	antoine
  Sponsored by:	The FreeBSD Foundation, Absolight

Modified:
  head/Mk/Uses/bdb.mk

Modified: head/Mk/Uses/bdb.mk
==============================================================================
--- head/Mk/Uses/bdb.mk	Thu Jun 16 13:17:48 2016	(r416963)
+++ head/Mk/Uses/bdb.mk	Thu Jun 16 13:21:06 2016	(r416964)
@@ -65,6 +65,8 @@ WARNING+=	"WITH_BDB_VER is deprecated an
 BDB_DEFAULT:=${WITH_BDB_VER}
 .endif
 
+.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
+
 _BDB_DEFAULT_save:=${BDB_DEFAULT}
 
 _DB_PORTS=		48 5 6
@@ -91,11 +93,13 @@ BDB_DEFAULT=	${${BDB_UNIQUENAME:tu:S,-,_
 
 # Override _bdb_ARGS with global BDB_DEFAULT if the maintainer did not
 # ask for a more specific version.
-.if defined(BDB_DEFAULT)
-. if ${BDB_DEFAULT} != 1
+. if ${_bdb_ARGS} == yes
+.  if ${BDB_DEFAULT} != 1
 _bdb_ARGS=	${BDB_DEFAULT}
+.  else
+_bdb_ARGS:=	48+
+.  endif
 . endif
-.endif
 
 # Compatiblity hack:
 # upgrade older plussed versions to 48+
@@ -106,10 +110,6 @@ _bdb_ARGS:=	48+
 . endif
 .endfor
 
-.if ${_bdb_ARGS} == yes
-_bdb_ARGS:=	48+
-.endif
-
 # 1. detect installed versions
 _INST_BDB_VER=
 .for bdb in ${_DB_PORTS}