From owner-svn-ports-head@FreeBSD.ORG Mon Jul 29 20:28:34 2013 Return-Path: Delivered-To: svn-ports-head@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 ESMTP id 6039051A; Mon, 29 Jul 2013 20:28:33 +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 2C62F2E98; Mon, 29 Jul 2013 20:28:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6TKSXKA022109; Mon, 29 Jul 2013 20:28:33 GMT (envelope-from mandree@svn.freebsd.org) Received: (from mandree@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6TKSXMY022108; Mon, 29 Jul 2013 20:28:33 GMT (envelope-from mandree@svn.freebsd.org) Message-Id: <201307292028.r6TKSXMY022108@svn.freebsd.org> From: Matthias Andree Date: Mon, 29 Jul 2013 20:28:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r323914 - 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Jul 2013 20:28:34 -0000 Author: mandree Date: Mon Jul 29 20:28:32 2013 New Revision: 323914 URL: http://svnweb.freebsd.org/changeset/ports/323914 Log: Update db*_DEPENDS to use new lib*.so:... LIB_DEPENDS format. [2] This fixes detection of db6 as a requisite [1], the new format no longer looks at ldconfig output, so the awkwardly-named libdb-N.M.so.0 symlinks are no longer required. Suggested by: bapt [2] Reported by: John Silva (direct email to mandree@) [1] Modified: head/Mk/bsd.database.mk Modified: head/Mk/bsd.database.mk ============================================================================== --- head/Mk/bsd.database.mk Mon Jul 29 20:25:33 2013 (r323913) +++ head/Mk/bsd.database.mk Mon Jul 29 20:28:32 2013 (r323914) @@ -285,16 +285,16 @@ LDFLAGS+= -L${LOCALBASE}/lib _DB_PORTS= 40 41 42 43 44 46 47 48 5 40+ 41+ 42+ 43+ 44+ 46+ 47+ 48+ # Dependence lines for different db versions -db40_DEPENDS= db4.0:${PORTSDIR}/databases/db4 -db41_DEPENDS= db41.1:${PORTSDIR}/databases/db41 -db42_DEPENDS= db-4.2.2:${PORTSDIR}/databases/db42 -db43_DEPENDS= db-4.3.0:${PORTSDIR}/databases/db43 -db44_DEPENDS= db-4.4.0:${PORTSDIR}/databases/db44 -db46_DEPENDS= db-4.6.0:${PORTSDIR}/databases/db46 -db47_DEPENDS= db-4.7.0:${PORTSDIR}/databases/db47 -db48_DEPENDS= db-4.8.0:${PORTSDIR}/databases/db48 -db5_DEPENDS= db-5.3.0:${PORTSDIR}/databases/db5 -db6_DEPENDS= db-6.0.0:${PORTSDIR}/databases/db6 +db40_DEPENDS= libdb4.so:${PORTSDIR}/databases/db4 +db41_DEPENDS= libdb41.so:${PORTSDIR}/databases/db41 +db42_DEPENDS= libdb-4.2.so:${PORTSDIR}/databases/db42 +db43_DEPENDS= libdb-4.3.so:${PORTSDIR}/databases/db43 +db44_DEPENDS= libdb-4.4.so:${PORTSDIR}/databases/db44 +db46_DEPENDS= libdb-4.6.so:${PORTSDIR}/databases/db46 +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 # Detect db versions by finding some files db40_FIND= ${LOCALBASE}/include/db4/db.h db41_FIND= ${LOCALBASE}/include/db41/db.h