diff options
| -rw-r--r-- | databases/php4-dba/files/patch-config.m4 | 14 | ||||
| -rw-r--r-- | lang/php4/Makefile.ext | 4 |
2 files changed, 13 insertions, 5 deletions
diff --git a/databases/php4-dba/files/patch-config.m4 b/databases/php4-dba/files/patch-config.m4 index d9de09e95578..68f03fb373d7 100644 --- a/databases/php4-dba/files/patch-config.m4 +++ b/databases/php4-dba/files/patch-config.m4 @@ -1,9 +1,13 @@ ---- config.m4.orig Thu Jul 8 16:53:32 2004 -+++ config.m4 Thu Jul 8 16:55:49 2004 -@@ -203,6 +203,14 @@ +--- config.m4.orig Sat Sep 25 23:32:20 2004 ++++ config.m4 Wed Jan 12 23:42:24 2005 +@@ -206,6 +206,18 @@ THIS_PREFIX=$i THIS_INCLUDE=$i/db4/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 @@ -15,12 +19,12 @@ elif test -f "$i/include/db4/db.h"; then THIS_PREFIX=$i THIS_INCLUDE=$i/include/db4/db.h -@@ -221,7 +229,7 @@ +@@ -224,7 +236,7 @@ break fi done - PHP_DBA_DB_CHECK(4, 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-4.2 db-4.1 db-4.0 db-4 db41 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)]) ++ PHP_DBA_DB_CHECK(4, db-4.3 db-4.2 db-4.1 db-4.0 db-4 db41 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)]) fi ]) AC_DBA_STD_RESULT(db4,Berkeley DB4) diff --git a/lang/php4/Makefile.ext b/lang/php4/Makefile.ext index ca0464e673ef..002a91252647 100644 --- a/lang/php4/Makefile.ext +++ b/lang/php4/Makefile.ext @@ -389,6 +389,9 @@ CONFIGURE_ARGS+=--without-cdb . endif . if defined(WITH_DB4) WITH_DB4_VER?= 41 +. if ${WITH_DB4_VER} == 43 +LIB_DEPENDS+= db-4.3.0:${PORTSDIR}/databases/db43 +. else . if ${WITH_DB4_VER} == 42 LIB_DEPENDS+= db-4.2.2:${PORTSDIR}/databases/db42 . else @@ -398,6 +401,7 @@ LIB_DEPENDS+= db4.0:${PORTSDIR}/databases/db4 LIB_DEPENDS+= db41.1:${PORTSDIR}/databases/db41 . endif . endif +. endif CONFIGURE_ARGS+=--with-db4=${LOCALBASE} . endif . if defined(WITH_GDBM) |