From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Dec 12 01:00:00 2012 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 987AC289 for ; Wed, 12 Dec 2012 01:00:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 6CBB08FC14 for ; Wed, 12 Dec 2012 01:00:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id qBC100BH022875 for ; Wed, 12 Dec 2012 01:00:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id qBC100o5022874; Wed, 12 Dec 2012 01:00:00 GMT (envelope-from gnats) Resent-Date: Wed, 12 Dec 2012 01:00:00 GMT Resent-Message-Id: <201212120100.qBC100o5022874@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Alexander Wittig Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7825A27B for ; Wed, 12 Dec 2012 00:58:33 +0000 (UTC) (envelope-from alex@wittig.name) Received: from hotzenplotz.wittig.name (hotzenplotz.wittig.name [IPv6:2a02:180:1:1::5b8f:51e8]) by mx1.freebsd.org (Postfix) with ESMTP id EF1CF8FC1A for ; Wed, 12 Dec 2012 00:58:32 +0000 (UTC) Received: from alex by hotzenplotz.wittig.name with local (Exim 4.80.1 (FreeBSD)) (envelope-from ) id 1Tiaec-0004ww-0y for FreeBSD-gnats-submit@freebsd.org; Wed, 12 Dec 2012 01:58:30 +0100 Message-Id: Date: Wed, 12 Dec 2012 01:58:30 +0100 From: Alexander Wittig Sender: Alexander Wittig To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.114 Subject: ports/174381: [patch] databases/php5-dba: update to patch of configure script to recognize BDB 5.3 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: Alexander Wittig List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2012 01:00:00 -0000 >Number: 174381 >Category: ports >Synopsis: [patch] databases/php5-dba: update to patch of configure script to recognize BDB 5.3 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Wed Dec 12 01:00:00 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Alexander Wittig >Release: FreeBSD 9.1-PRERELEASE amd64 >Organization: >Environment: System: FreeBSD hotzenplotz.wittig.name 9.1-PRERELEASE FreeBSD 9.1-PRERELEASE #0 r243418: Fri Nov 23 04:46:09 CET 2012 root@hotzenplotz.wittig.name:/usr/obj/usr/src/sys/ALEX amd64 >Description: The configure script tests for various versions of BDB. Unfortunately not the latest BDB 5.3 that is in the ports tree as databases/db5. I've been manually fixing this for a while, but the latest PHP update again broke it so I finally caved in and made an actual patch :-) Seems to work for me, php5-dba is able to handle db53 as is if configure finds it. >How-To-Repeat: Install databases/bdb53 Try to build databases/php5-dba Enjoy configure choke in BDB tests >Fix: Attached is a replacement for the patch included in the php5-dba port right now. This is not a patch of the patch, but a complete replacement. For completeness sake I added all current versions of BDB, not just 5.3 which is in the ports tree. --- patch-config.m4 begins here --- --- config.m4.orig 2012-12-12 01:41:26.000000000 +0100 +++ config.m4 2012-12-12 01:44:24.000000000 +0100 @@ -311,7 +311,7 @@ PHP_DBA_STD_BEGIN dbdp4="/usr/local/BerkeleyDB.4." dbdp5="/usr/local/BerkeleyDB.5." - for i in $PHP_DB4 ${dbdp5}1 ${dbdp5}0 ${dbdp4}8 ${dbdp4}7 ${dbdp4}6 ${dbdp4}5 ${dbdp4}4 ${dbdp4}3 ${dbdp4}2 ${dbdp4}1 ${dbdp}0 /usr/local /usr; do + for i in $PHP_DB4 ${dbdp5}3 ${dbdp5}2 ${dbdp5}1 ${dbdp5}0 ${dbdp4}8 ${dbdp4}7 ${dbdp4}6 ${dbdp4}5 ${dbdp4}4 ${dbdp4}3 ${dbdp4}2 ${dbdp4}1 ${dbdp}0 /usr/local /usr; do if test -f "$i/db5/db.h"; then THIS_PREFIX=$i THIS_INCLUDE=$i/db5/db.h @@ -320,6 +320,66 @@ THIS_PREFIX=$i THIS_INCLUDE=$i/db4/db.h break + elif test -f "$i/include/db5/db.h"; then + THIS_PREFIX=$i + THIS_INCLUDE=$i/include/db5/db.h + break + elif test -f "$i/include/db53/db.h"; then + THIS_PREFIX=$i + THIS_INCLUDE=$i/include/db53/db.h + break + elif test -f "$i/include/db52/db.h"; then + THIS_PREFIX=$i + THIS_INCLUDE=$i/include/db52/db.h + break + elif test -f "$i/include/db51/db.h"; then + THIS_PREFIX=$i + THIS_INCLUDE=$i/include/db51/db.h + break + elif test -f "$i/include/db50/db.h"; then + THIS_PREFIX=$i + THIS_INCLUDE=$i/include/db50/db.h + break + elif test -f "$i/include/db48/db.h"; then + THIS_PREFIX=$i + THIS_INCLUDE=$i/include/db48/db.h + break + elif test -f "$i/include/db47/db.h"; then + THIS_PREFIX=$i + THIS_INCLUDE=$i/include/db47/db.h + break + elif test -f "$i/include/db46/db.h"; then + THIS_PREFIX=$i + THIS_INCLUDE=$i/include/db46/db.h + break + elif test -f "$i/include/db45/db.h"; then + THIS_PREFIX=$i + THIS_INCLUDE=$i/include/db45/db.h + break + elif test -f "$i/include/db44/db.h"; then + THIS_PREFIX=$i + THIS_INCLUDE=$i/include/db44/db.h + break + elif test -f "$i/include/db43/db.h"; then + THIS_PREFIX=$i + THIS_INCLUDE=$i/include/db43/db.h + break + elif test -f "$i/include/db42/db.h"; then + THIS_PREFIX=$i + THIS_INCLUDE=$i/include/db42/db.h + break + elif test -f "$i/include/db41/db.h"; then + THIS_PREFIX=$i + THIS_INCLUDE=$i/include/db41/db.h + break + elif test -f "$i/include/db5.3/db.h"; then + THIS_PREFIX=$i + THIS_INCLUDE=$i/include/db5.3/db.h + break + elif test -f "$i/include/db5.2/db.h"; then + THIS_PREFIX=$i + THIS_INCLUDE=$i/include/db5.2/db.h + break elif test -f "$i/include/db5.1/db.h"; then THIS_PREFIX=$i THIS_INCLUDE=$i/include/db5.1/db.h @@ -362,7 +422,7 @@ break fi done - PHP_DBA_DB_CHECK(4, db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)]) + PHP_DBA_DB_CHECK(4, db-5.3 db-5.2 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)]) fi PHP_DBA_STD_RESULT(db4,Berkeley DB4) --- patch-config.m4 ends here --- >Release-Note: >Audit-Trail: >Unformatted: