From owner-svn-ports-all@FreeBSD.ORG  Tue Jul 15 06:20:44 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2A619DDC;
 Tue, 15 Jul 2014 06:20:44 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 17F962F8C;
 Tue, 15 Jul 2014 06:20:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6F6Khko062032;
 Tue, 15 Jul 2014 06:20:43 GMT (envelope-from mandree@svn.freebsd.org)
Received: (from mandree@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6F6KhmP062031;
 Tue, 15 Jul 2014 06:20:43 GMT (envelope-from mandree@svn.freebsd.org)
Message-Id: <201407150620.s6F6KhmP062031@svn.freebsd.org>
From: Matthias Andree <mandree@FreeBSD.org>
Date: Tue, 15 Jul 2014 06:20:43 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r361873 - 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-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Jul 2014 06:20:44 -0000

Author: mandree
Date: Tue Jul 15 06:20:43 2014
New Revision: 361873
URL: http://svnweb.freebsd.org/changeset/ports/361873
QAT: https://qat.redports.org/buildarchive/r361873/

Log:
  Fix db6_DEPENDS and the corresponding BDB_LIB[_CXX]_NAME for db6.1 upgrade.
  Reported by: Ajtim

Modified:
  head/Mk/bsd.database.mk

Modified: head/Mk/bsd.database.mk
==============================================================================
--- head/Mk/bsd.database.mk	Tue Jul 15 06:19:31 2014	(r361872)
+++ head/Mk/bsd.database.mk	Tue Jul 15 06:20:43 2014	(r361873)
@@ -302,7 +302,7 @@ db46_DEPENDS=	libdb-4.6.so:${PORTSDIR}/d
 db47_DEPENDS=	libdb-4.7.so:${PORTSDIR}/databases/db47
 db48_DEPENDS=	libdb-4.8.so:${PORTSDIR}/databases/db48
 db5_DEPENDS=	libdb-5.3.so:${PORTSDIR}/databases/db5
-db6_DEPENDS=	libdb-6.0.so:${PORTSDIR}/databases/db6
+db6_DEPENDS=	libdb-6.1.so:${PORTSDIR}/databases/db6
 # Detect db versions by finding some files
 db40_FIND=	${LOCALBASE}/include/db4/db.h
 db41_FIND=	${LOCALBASE}/include/db41/db.h
@@ -468,8 +468,8 @@ BDB_LIB_NAME=		db-5.3
 BDB_LIB_CXX_NAME=	db_cxx-5.3
 BDB_LIB_DIR=		${LOCALBASE}/lib/db5
 .  elif ${_BDB_VER} == 6
-BDB_LIB_NAME=		db-6.0
-BDB_LIB_CXX_NAME=	db_cxx-6.0
+BDB_LIB_NAME=		db-6.1
+BDB_LIB_CXX_NAME=	db_cxx-6.1
 BDB_LIB_DIR=		${LOCALBASE}/lib/db6
 .  endif
 BDB_LIB_NAME?=		db${_BDB_VER}