Date: Fri, 26 Aug 2011 14:03:31 +0800 (CST) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: ale@FreeBSD.org Subject: ports/160197: [PATCH] databases/php5-dba: fix build with db5 Message-ID: <20110826060331.4C0CA743@sunpoet.net> Resent-Message-ID: <201108260610.p7Q6A8wm018416@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 160197 >Category: ports >Synopsis: [PATCH] databases/php5-dba: fix build with db5 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Aug 26 06:10:08 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Sunpoet Po-Chuan Hsieh >Release: FreeBSD 8.2-STABLE amd64 >Organization: The FreeBSD Project >Environment: System: FreeBSD bonjour.sunpoet.net 8.2-STABLE FreeBSD 8.2-STABLE #0: Sat Jul 9 23:23:51 CST >Description: - Fix build with db5 Port maintainer (ale@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- php5-dba-5.3.8.patch begins here --- Index: files/patch-config.m4 =================================================================== RCS file: /home/ncvs/ports/databases/php5-dba/files/patch-config.m4,v retrieving revision 1.11 diff -u -u -r1.11 patch-config.m4 --- files/patch-config.m4 19 Aug 2011 09:33:30 -0000 1.11 +++ files/patch-config.m4 26 Aug 2011 06:03:05 -0000 @@ -1,9 +1,13 @@ ---- config.m4.orig 2010-12-01 20:20:16.000000000 +0100 -+++ config.m4 2011-02-08 11:40:04.000000000 +0100 -@@ -285,6 +285,46 @@ +--- config.m4.orig 2011-06-28 04:28:30.000000000 +0800 ++++ config.m4 2011-08-26 12:01:34.328413280 +0800 +@@ -285,6 +285,50 @@ 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/db51/db.h"; then + THIS_PREFIX=$i + THIS_INCLUDE=$i/include/db51/db.h @@ -47,3 +51,12 @@ elif test -f "$i/include/db5.1/db.h"; then THIS_PREFIX=$i THIS_INCLUDE=$i/include/db5.1/db.h +@@ -327,7 +371,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.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) + --- php5-dba-5.3.8.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110826060331.4C0CA743>