Attachment #91170 for bug #128468

View | Details | Raw Unified | Return to bug 128468
Collapse All | Expand All




--- config.m4.orig	2007-12-06 08:17:43.000000000 -0600
+++ config.m4	2008-10-29 11:58:50.000000000 -0500
@@ -276,9 +276,9 @@
   PHP_DBA_STD_BEGIN
   dbdp="/usr/local/BerkeleyDB.4."
   for i in $PHP_DB4 ${dbdp}6 ${dbdp}5 ${dbdp}4 ${dbdp}3  ${dbdp}2 ${dbdp}1 ${dbdp}0 /usr/local /usr; do
-    if test -f "$i/db4/db.h"; then
+    if test -f "BDB_INCLUDE_DIR/db.h"; then
       THIS_PREFIX=$i
-      THIS_INCLUDE=$i/db4/db.h
+      THIS_INCLUDE=BDB_INCLUDE_DIR/db.h
       break
+    elif test -f "$i/include/db46/db.h"; then
+      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
+      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
+      break
+    elif test -f "$i/include/db41/db.h"; then
+      THIS_PREFIX=$i
+      THIS_INCLUDE=$i/include/db41/db.h
+      break
     elif test -f "$i/include/db4.6/db.h"; then
       THIS_PREFIX=$i
@@ -306,7 +306,7 @@
       break
     fi
   done
-  PHP_DBA_DB_CHECK(4, 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, BDB_LIB_NAME, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
 fi
 PHP_DBA_STD_RESULT(db4,Berkeley DB4)
 





USE_PHP=	pdo
USE_PHP_BUILD=	yes
#PHP_HEADER_DIRS=sqlite/src
.endif



CONFIGURE_ARGS+=--without-cdb
.	endif
.	if defined(WITH_DB4)
USE_BDB=		yes
INVALID_BDB_VER=	2 3
OBSOLETE_BDB_VAR=	WITH_DB4_VER
#WITH_BDB_VER?=		46+
.		if ${WITH_DB4_VER} == 44
LIB_DEPENDS+=	db-4.4.0:${PORTSDIR}/databases/db44
.		else
.		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
.		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.6.0:${PORTSDIR}/databases/db46
.		endif
.		endif
.		endif
.		endif
.		endif
.		endif
CONFIGURE_ARGS+=--with-db4=${LOCALBASE}
.	endif
.	if defined(WITH_GDBM)

.	if defined(WITHOUT_FLATFILE)
CONFIGURE_ARGS+=--without-flatfile
.	endif

. if defined(WITH_DB4)
post-patch:
	${REINPLACE_CMD} -e "s!BDB_LIB_NAME!${BDB_LIB_NAME}!g" \
		-e "s!BDB_INCLUDE_DIR!${BDB_INCLUDE_DIR:S,^${PREFIX}/,,}!g" \
		${WRKSRC}/config.m4
. endif
.endif

.if ${PHP_MODNAME} == "gd"

Return to bug 128468

Lines 310-316 Link Here

(-)lang/php5/Makefile.ext (-27 / +12 lines)
310		310
311	USE_PHP= pdo	311	USE_PHP= pdo
312	USE_PHP_BUILD= yes	312	USE_PHP_BUILD= yes
313	PHP_HEADER_DIRS=sqlite/src	313	#PHP_HEADER_DIRS=sqlite/src
314	.endif	314	.endif
315		315
316		316
Lines 502-533 Link Here
502	CONFIGURE_ARGS+=--without-cdb	502	CONFIGURE_ARGS+=--without-cdb
503	. endif	503	. endif
504	. if defined(WITH_DB4)	504	. if defined(WITH_DB4)
505	WITH_DB4_VER?= 46	505	USE_BDB= yes
506	. if ${WITH_DB4_VER} == 45	506	INVALID_BDB_VER= 2 3
507	LIB_DEPENDS+= db-4.5.0:${PORTSDIR}/databases/db45	507	OBSOLETE_BDB_VAR= WITH_DB4_VER
508	. else	508	#WITH_BDB_VER?= 46+
509	. if ${WITH_DB4_VER} == 44
510	LIB_DEPENDS+= db-4.4.0:${PORTSDIR}/databases/db44
511	. else
512	. if ${WITH_DB4_VER} == 43
513	LIB_DEPENDS+= db-4.3.0:${PORTSDIR}/databases/db43
514	. else
515	. if ${WITH_DB4_VER} == 42
516	LIB_DEPENDS+= db-4.2.2:${PORTSDIR}/databases/db42
517	. else
518	. if ${WITH_DB4_VER} == 41
519	LIB_DEPENDS+= db41.1:${PORTSDIR}/databases/db41
520	. else
521	. if ${WITH_DB4_VER} == 4
522	LIB_DEPENDS+= db4.0:${PORTSDIR}/databases/db4
523	. else
524	LIB_DEPENDS+= db-4.6.0:${PORTSDIR}/databases/db46
525	. endif
526	. endif
527	. endif
528	. endif
529	. endif
530	. endif
531	CONFIGURE_ARGS+=--with-db4=${LOCALBASE}	509	CONFIGURE_ARGS+=--with-db4=${LOCALBASE}
532	. endif	510	. endif
533	. if defined(WITH_GDBM)	511	. if defined(WITH_GDBM)
Lines 546-551 Link Here
546	. if defined(WITHOUT_FLATFILE)	524	. if defined(WITHOUT_FLATFILE)
547	CONFIGURE_ARGS+=--without-flatfile	525	CONFIGURE_ARGS+=--without-flatfile
548	. endif	526	. endif
		527
		528	. if defined(WITH_DB4)
		529	post-patch:
		530	${REINPLACE_CMD} -e "s!BDB_LIB_NAME!${BDB_LIB_NAME}!g" \
		531	-e "s!BDB_INCLUDE_DIR!${BDB_INCLUDE_DIR:S,^${PREFIX}/,,}!g" \
		532	${WRKSRC}/config.m4
		533	. endif
549	.endif	534	.endif
550		535
551	.if ${PHP_MODNAME} == "gd"	536	.if ${PHP_MODNAME} == "gd"

Lines 1-33 Link Here

(-)databases/php5-dba/files/patch-config.m4 (-29 / +19 lines)
1	--- config.m4.orig 2007-12-06 15:17:43.000000000 +0100	1	--- config.m4.orig 2007-12-06 08:17:43.000000000 -0600
2	+++ config.m4 2008-05-02 10:05:06.000000000 +0200	2	+++ config.m4 2008-10-29 11:58:50.000000000 -0500
3	@@ -280,6 +280,30 @@	3	@@ -276,9 +276,9 @@
		4	PHP_DBA_STD_BEGIN
		5	dbdp="/usr/local/BerkeleyDB.4."
		6	for i in $PHP_DB4 ${dbdp}6 ${dbdp}5 ${dbdp}4 ${dbdp}3 ${dbdp}2 ${dbdp}1 ${dbdp}0 /usr/local /usr; do
		7	- if test -f "$i/db4/db.h"; then
		8	+ if test -f "BDB_INCLUDE_DIR/db.h"; then
4	THIS_PREFIX=$i	9	THIS_PREFIX=$i
5	THIS_INCLUDE=$i/db4/db.h	10	- THIS_INCLUDE=$i/db4/db.h
		11	+ THIS_INCLUDE=BDB_INCLUDE_DIR/db.h
6	break	12	break
7	+ elif test -f "$i/include/db46/db.h"; then
8	+ THIS_PREFIX=$i
9	+ THIS_INCLUDE=$i/include/db46/db.h
10	+ break
11	+ elif test -f "$i/include/db45/db.h"; then
12	+ THIS_PREFIX=$i
13	+ THIS_INCLUDE=$i/include/db45/db.h
14	+ break
15	+ elif test -f "$i/include/db44/db.h"; then
16	+ THIS_PREFIX=$i
17	+ THIS_INCLUDE=$i/include/db44/db.h
18	+ break
19	+ elif test -f "$i/include/db43/db.h"; then
20	+ THIS_PREFIX=$i
21	+ THIS_INCLUDE=$i/include/db43/db.h
22	+ break
23	+ elif test -f "$i/include/db42/db.h"; then
24	+ THIS_PREFIX=$i
25	+ THIS_INCLUDE=$i/include/db42/db.h
26	+ break
27	+ elif test -f "$i/include/db41/db.h"; then
28	+ THIS_PREFIX=$i
29	+ THIS_INCLUDE=$i/include/db41/db.h
30	+ break
31	elif test -f "$i/include/db4.6/db.h"; then	13	elif test -f "$i/include/db4.6/db.h"; then
32	THIS_PREFIX=$i	14	THIS_PREFIX=$i
33	THIS_INCLUDE=$i/include/db4.6/db.h	15	@@ -306,7 +306,7 @@
		16	break
		17	fi
		18	done
		19	- PHP_DBA_DB_CHECK(4, 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)])
		20	+ PHP_DBA_DB_CHECK(4, BDB_LIB_NAME, [(void)db_create((DB*)0, (DB_ENV)0, 0)])
		21	fi
		22	PHP_DBA_STD_RESULT(db4,Berkeley DB4)
		23