Date: Thu, 4 May 2006 14:20:23 +0800 (CST) From: Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/96748: Support Berkeley DB 4.4 in PHP5 (php5-dba) Message-ID: <20060504062023.0F2881701D@sunpoet.net> Resent-Message-ID: <200605040630.k446UFnw033419@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 96748
>Category: ports
>Synopsis: Support Berkeley DB 4.4 in PHP5 (php5-dba)
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu May 04 06:30:14 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Sunpoet Po-Chuan Hsieh
>Release: FreeBSD 6.1-RC i386
>Organization:
SUNPOET.net
>Environment:
System: FreeBSD IRIS.sunpoet.net 6.1-RC FreeBSD 6.1-RC #3: Tue Apr 11 22:24:01 CST 2006 sunpoet@IRIS.sunpoet.net:/usr/obj/usr/src/sys/sunpoet i386
>Description:
Support Berkeley DB 4.4 in PHP5.
>How-To-Repeat:
>Fix:
% diff -u /usr/ports/lang/php5/Makefile.ext.orig /usr/ports/lang/php5/Makefile.ext
--- /usr/ports/lang/php5/Makefile.ext.orig Wed Jan 18 20:28:09 2006
+++ /usr/ports/lang/php5/Makefile.ext Sun Apr 9 15:51:10 2006
@@ -397,20 +397,9 @@
CONFIGURE_ARGS+=--without-cdb
. endif
. if defined(WITH_DB4)
-WITH_DB4_VER?= 43
-. if ${WITH_DB4_VER} == 42
-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
-. else
-LIB_DEPENDS+= db-4.3.0:${PORTSDIR}/databases/db43
-. endif
-. endif
-. endif
+USE_BDB= YES
+WITH_DB4_VER?= 44
+WITH_BDB_VER= ${WITH_DB4_VER}
CONFIGURE_ARGS+=--with-db4=${LOCALBASE}
. endif
. if defined(WITH_GDBM)
% diff -u /usr/ports/databases/php5-dba/files/patch-config.m4.orig /usr/ports/databases/php5-dba/files/patch-config.m4
--- /usr/ports/databases/php5-dba/files/patch-config.m4.orig Sun Sep 11 15:06:45 2005
+++ /usr/ports/databases/php5-dba/files/patch-config.m4 Sun Apr 9 22:18:06 2006
@@ -1,9 +1,19 @@
--- config.m4.orig Mon Aug 22 21:59:36 2005
+++ config.m4 Thu Sep 8 10:48:31 2005
-@@ -240,6 +240,18 @@
+@@ -239,11 +239,27 @@
+ [ --with-db4[=DIR] DBA: Include Berkeley DB4 support],[
+ if test "$withval" != "no"; then
+ PHP_DBA_STD_BEGIN
+- for i in $withval /usr/local/BerkeleyDB.4.2 /usr/local/BerkeleyDB.4.1 /usr/local/BerkeleyDB.4.0 /usr/local /usr; do
++ for i in $withval /usr/local/BerkeleyDB.4.4 /usr/local/BerkeleyDB.4.3 /usr/local/BerkeleyDB.4.2 /usr/local/BerkeleyDB.4.1 /usr/local/BerkeleyDB.4.0 /usr/local /usr; do
+ if test -f "$i/db4/db.h"; then
THIS_PREFIX=$i
THIS_INCLUDE=$i/db4/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
@@ -19,3 +29,12 @@
elif test -f "$i/include/db4/db.h"; then
THIS_PREFIX=$i
THIS_INCLUDE=$i/include/db4/db.h
+@@ -262,7 +278,7 @@
+ break
+ fi
+ done
+- PHP_DBA_DB_CHECK(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-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
+ ])
+ AC_DBA_STD_RESULT(db4,Berkeley DB4)
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060504062023.0F2881701D>