Date: Wed, 12 Dec 2012 09:21:09 +0000 (UTC) From: Alex Dupre <ale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r308751 - head/databases/php5-dba/files Message-ID: <201212120921.qBC9L9VW008106@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ale Date: Wed Dec 12 09:21:09 2012 New Revision: 308751 URL: http://svnweb.freebsd.org/changeset/ports/308751 Log: Fix build with databases/db5. PR: ports/174381 Submitted by: Alexander Wittig <alexander@wittig.name> Modified: head/databases/php5-dba/files/patch-config.m4 Modified: head/databases/php5-dba/files/patch-config.m4 ============================================================================== --- head/databases/php5-dba/files/patch-config.m4 Wed Dec 12 09:04:54 2012 (r308750) +++ head/databases/php5-dba/files/patch-config.m4 Wed Dec 12 09:21:09 2012 (r308751) @@ -1,6 +1,6 @@ ---- config.m4.orig 2011-06-27 22:28:30.000000000 +0200 -+++ config.m4 2011-08-26 09:32:43.000000000 +0200 -@@ -285,6 +285,50 @@ +--- config.m4.orig 2012-11-21 06:12:20.000000000 +0100 ++++ config.m4 2012-12-12 10:18:42.000000000 +0100 +@@ -320,6 +320,38 @@ THIS_PREFIX=$i THIS_INCLUDE=$i/db4/db.h break @@ -8,14 +8,6 @@ + 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 -+ 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 @@ -28,10 +20,6 @@ + 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 @@ -51,12 +39,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 @@ +@@ -362,7 +394,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)]) ++ PHP_DBA_DB_CHECK(4, db-5 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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212120921.qBC9L9VW008106>