diff options
| -rw-r--r-- | databases/php5-dba/files/patch-config.m4 | 14 | ||||
| -rw-r--r-- | lang/php4/Makefile.ext | 14 | ||||
| -rw-r--r-- | lang/php5/Makefile.ext | 12 | ||||
| -rw-r--r-- | lang/php53/Makefile.ext | 12 |
4 files changed, 32 insertions, 20 deletions
diff --git a/databases/php5-dba/files/patch-config.m4 b/databases/php5-dba/files/patch-config.m4 index d9de09e95578..0e075c473660 100644 --- a/databases/php5-dba/files/patch-config.m4 +++ b/databases/php5-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 Jan 22 02:36:56 2005 ++++ config.m4 Tue Jun 14 16:43:06 2005 +@@ -240,6 +240,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 @@ +@@ -258,7 +270,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 75c153c20bee..c39cfe598a23 100644 --- a/lang/php4/Makefile.ext +++ b/lang/php4/Makefile.ext @@ -386,17 +386,17 @@ CONFIGURE_ARGS+=--with-zlib=/usr 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 +WITH_DB4_VER?= 43 . if ${WITH_DB4_VER} == 42 -LIB_DEPENDS+= db-4.2.2:${PORTSDIR}/databases/db42 +LIB_DEPENDS+= db-4.2.2:${PORTSDIR}/databases/db42 +. else +. if ${WITH_DB4_VER} == 41 +LIB_DEPENDS+= db41.1:${PORTSDIR}/databases/db41 . else . if ${WITH_DB4_VER} == 4 -LIB_DEPENDS+= db4.0:${PORTSDIR}/databases/db4 +LIB_DEPENDS+= db4.0:${PORTSDIR}/databases/db4 . else -LIB_DEPENDS+= db41.1:${PORTSDIR}/databases/db41 +LIB_DEPENDS+= db-4.3.0:${PORTSDIR}/databases/db43 . endif . endif . endif diff --git a/lang/php5/Makefile.ext b/lang/php5/Makefile.ext index c3774d39f8fb..01f62c8d8a4d 100644 --- a/lang/php5/Makefile.ext +++ b/lang/php5/Makefile.ext @@ -407,14 +407,18 @@ CONFIGURE_ARGS+=--with-zlib=/usr CONFIGURE_ARGS+=--without-cdb . endif . if defined(WITH_DB4) -WITH_DB4_VER?= 41 +WITH_DB4_VER?= 43 . if ${WITH_DB4_VER} == 42 -LIB_DEPENDS+= db-4.2.2:${PORTSDIR}/databases/db42 +LIB_DEPENDS+= db-4.2.2:${PORTSDIR}/databases/db42 +. else +. if ${WITH_DB4_VER} == 41 +LIB_DEPENDS+= db41.1:${PORTSDIR}/databases/db41 . else . if ${WITH_DB4_VER} == 4 -LIB_DEPENDS+= db4.0:${PORTSDIR}/databases/db4 +LIB_DEPENDS+= db4.0:${PORTSDIR}/databases/db4 . else -LIB_DEPENDS+= db41.1:${PORTSDIR}/databases/db41 +LIB_DEPENDS+= db-4.3.0:${PORTSDIR}/databases/db43 +. endif . endif . endif CONFIGURE_ARGS+=--with-db4=${LOCALBASE} diff --git a/lang/php53/Makefile.ext b/lang/php53/Makefile.ext index c3774d39f8fb..01f62c8d8a4d 100644 --- a/lang/php53/Makefile.ext +++ b/lang/php53/Makefile.ext @@ -407,14 +407,18 @@ CONFIGURE_ARGS+=--with-zlib=/usr CONFIGURE_ARGS+=--without-cdb . endif . if defined(WITH_DB4) -WITH_DB4_VER?= 41 +WITH_DB4_VER?= 43 . if ${WITH_DB4_VER} == 42 -LIB_DEPENDS+= db-4.2.2:${PORTSDIR}/databases/db42 +LIB_DEPENDS+= db-4.2.2:${PORTSDIR}/databases/db42 +. else +. if ${WITH_DB4_VER} == 41 +LIB_DEPENDS+= db41.1:${PORTSDIR}/databases/db41 . else . if ${WITH_DB4_VER} == 4 -LIB_DEPENDS+= db4.0:${PORTSDIR}/databases/db4 +LIB_DEPENDS+= db4.0:${PORTSDIR}/databases/db4 . else -LIB_DEPENDS+= db41.1:${PORTSDIR}/databases/db41 +LIB_DEPENDS+= db-4.3.0:${PORTSDIR}/databases/db43 +. endif . endif . endif CONFIGURE_ARGS+=--with-db4=${LOCALBASE} |