From owner-svn-ports-head@FreeBSD.ORG  Mon Aug  5 19:43:40 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id F3934D02;
 Mon,  5 Aug 2013 19:43:39 +0000 (UTC)
 (envelope-from mandree@FreeBSD.org)
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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id E1591233F;
 Mon,  5 Aug 2013 19:43:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r75JhdUV006066;
 Mon, 5 Aug 2013 19:43:39 GMT (envelope-from mandree@svn.freebsd.org)
Received: (from mandree@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r75Jhdfc006065;
 Mon, 5 Aug 2013 19:43:39 GMT (envelope-from mandree@svn.freebsd.org)
Message-Id: <201308051943.r75Jhdfc006065@svn.freebsd.org>
From: Matthias Andree <mandree@FreeBSD.org>
Date: Mon, 5 Aug 2013 19:43:39 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r324283 - head/Mk
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
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Aug 2013 19:43:40 -0000

Author: mandree
Date: Mon Aug  5 19:43:39 2013
New Revision: 324283
URL: http://svnweb.freebsd.org/changeset/ports/324283

Log:
  Fix BUILD_DEPENDS line for devel/subversion builds with STATIC option.
  While here, complete _DB_PORTS list for 5 and 6,
  and add a few descriptive comments.
  
  Submitted by:	Tim Kientzle

Modified:
  head/Mk/bsd.database.mk

Modified: head/Mk/bsd.database.mk
==============================================================================
--- head/Mk/bsd.database.mk	Mon Aug  5 19:05:48 2013	(r324282)
+++ head/Mk/bsd.database.mk	Mon Aug  5 19:43:39 2013	(r324283)
@@ -283,7 +283,7 @@ LDFLAGS+=		-L${LOCALBASE}/lib
 
 .if defined(USE_BDB)
 
-_DB_PORTS=	40 41 42 43 44 46 47 48 5 40+ 41+ 42+ 43+ 44+ 46+ 47+ 48+
+_DB_PORTS=	40 41 42 43 44 46 47 48 5 6 40+ 41+ 42+ 43+ 44+ 46+ 47+ 48+ 5+ 6+
 # Dependence lines for different db versions
 db40_DEPENDS=	libdb4.so:${PORTSDIR}/databases/db4
 db41_DEPENDS=	libdb41.so:${PORTSDIR}/databases/db41
@@ -420,8 +420,10 @@ _BDB_IGNORE=	yes
 IGNORE=		cannot install: does not work with Berkeley DB version ${_BDB_VER} (${INVALID_BDB_VER} not supported)
 . else
 # Now add the dependency on Berkeley DB ${_BDB_VER) version
+# This is for ports that want to link Berkeley DB statically, such
+# as devel/subversion, if the corresponding option is active:
 .if defined(BDB_BUILD_DEPENDS)
-BUILD_DEPENDS+=	${db${_BDB_VER}_FIND}:${db${_BDB_VER}_DEPENDS:C/^db.*://}
+BUILD_DEPENDS+=	${db${_BDB_VER}_FIND}:${db${_BDB_VER}_DEPENDS:C/^libdb.*://}
 .else
 LIB_DEPENDS+=	${db${_BDB_VER}_DEPENDS}
 .endif
@@ -470,7 +472,9 @@ BDB_LIB_DIR?=		${LOCALBASE}/lib
 BDB_VER=	${_BDB_VER}
 .endif
 
-# Obsolete variables
+# Obsolete variables - ports can define these to want users about
+# variables that may be in /etc/make.conf but that are no longer
+# effective:
 .if defined(OBSOLETE_BDB_VAR)
 . for var in ${OBSOLETE_BDB_VAR}
 .  if defined(${var})