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

(-)databases/php4-dba/files/patch-config.m4 (-23 / +12 lines)
Lines 1-34 Link Here
1 
--- config.m4.orig	Tue Nov 28 12:41:35 2006
 1 
--- config.m4-orig	2006-11-28 05:41:35.000000000 -0600
2 
+++ config.m4	Sat Feb 17 11:13:51 2007
 2 
+++ config.m4	2008-10-29 12:32:36.000000000 -0500
3 
@@ -205,6 +205,22 @@
 3 
@@ -201,9 +201,9 @@
4 
   if test "$withval" != "no"; then
5 
     PHP_DBA_STD_BEGIN
6 
     for i in $withval /usr/local/BerkeleyDB.4.2 /usr/local/BerkeleyDB.4.1 /usr/local/BerkeleyDB.4.0 /usr/local /usr; do
7 
-      if test -f "$i/db4/db.h"; then
8 
+      if test -f "$i/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=$i/BDB_INCLUDE_DIR/db.h
6 
         break
 12 
         break
7 
+      elif test -f "$i/include/db44/db.h"; then
8 
+        THIS_PREFIX=$i
9 
+        THIS_INCLUDE=$i/include/db44/db.h
10 
+        break
11 
+      elif test -f "$i/include/db43/db.h"; then
12 
+        THIS_PREFIX=$i
13 
+        THIS_INCLUDE=$i/include/db43/db.h
14 
+        break
15 
+      elif test -f "$i/include/db42/db.h"; then
16 
+        THIS_PREFIX=$i
17 
+        THIS_INCLUDE=$i/include/db42/db.h
18 
+        break
19 
+      elif test -f "$i/include/db41/db.h"; then
20 
+        THIS_PREFIX=$i
21 
+        THIS_INCLUDE=$i/include/db41/db.h
22 
+        break
23 
       elif test -f "$i/include/db4/db.h"; then
 13 
       elif test -f "$i/include/db4/db.h"; then
24 
         THIS_PREFIX=$i
 14 
         THIS_PREFIX=$i
25 
         THIS_INCLUDE=$i/include/db4/db.h
 15 
@@ -223,7 +223,7 @@
26 
@@ -223,7 +239,7 @@
27 
         break
 16 
         break
28 
       fi
 17 
       fi
29 
     done
 18 
     done
30 
-    PHP_DBA_DB_CHECK(4, 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)])
 19 
-    PHP_DBA_DB_CHECK(4, 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)])
31 
+    PHP_DBA_DB_CHECK(4, db-4.5 db-4.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)])
 20 
+    PHP_DBA_DB_CHECK(4, BDB_LIB_NAME, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
32 
   fi
 21 
   fi
33 
 ])
 22 
 ])
34 
 AC_DBA_STD_RESULT(db4,Berkeley DB4)
 23 
 AC_DBA_STD_RESULT(db4,Berkeley DB4)
(-)lang/php4/Makefile.ext (-18 / +11 lines)
Lines 387-410 Link Here
387 
CONFIGURE_ARGS+=--without-cdb
 387 
CONFIGURE_ARGS+=--without-cdb
388 
.	endif
 388 
.	endif
389 
.	if defined(WITH_DB4)
 389 
.	if defined(WITH_DB4)
390 
WITH_DB4_VER?=	44
 390 
USE_BDB=		yes
391 
.		if ${WITH_DB4_VER} == 43
 391 
INVALID_BDB_VER=	2 3
392 
LIB_DEPENDS+=	db-4.3.0:${PORTSDIR}/databases/db43
 392 
OBSOLETE_BDB_VAR=	WITH_DB4_VER
393 
.		else
 393 
#WITH_BDB_VER?=		44+
394 
.		if ${WITH_DB4_VER} == 42
395 
LIB_DEPENDS+=	db-4.2.2:${PORTSDIR}/databases/db42
396 
.		else
397 
.		if ${WITH_DB4_VER} == 41
398 
LIB_DEPENDS+=	db41.1:${PORTSDIR}/databases/db41
399 
.		else
400 
.		if ${WITH_DB4_VER} == 4
401 
LIB_DEPENDS+=	db4.0:${PORTSDIR}/databases/db4
402 
.		else
403 
LIB_DEPENDS+=	db-4.4.0:${PORTSDIR}/databases/db44
404 
.		endif
405 
.		endif
406 
.		endif
407 
.		endif
408 
CONFIGURE_ARGS+=--with-db4=${LOCALBASE}
 394 
CONFIGURE_ARGS+=--with-db4=${LOCALBASE}
409 
.	endif
 395 
.	endif
410 
.	if defined(WITH_GDBM)
 396 
.	if defined(WITH_GDBM)
Lines 418-423 Link Here
418 
.	if defined(WITHOUT_FLATFILE)
 404 
.	if defined(WITHOUT_FLATFILE)
419 
CONFIGURE_ARGS+=--without-flatfile
 405 
CONFIGURE_ARGS+=--without-flatfile
420 
.	endif
 406 
.	endif
407 

            

            

              408
              
. if defined(WITH_DB4)

            

            

              409
              
post-patch:

            

            

              410
              
	${REINPLACE_CMD} -e "s!BDB_LIB_NAME!${BDB_LIB_NAME}!g" \

            

            

              411
              
		-e "s!BDB_INCLUDE_DIR!${BDB_INCLUDE_DIR:S,^${PREFIX}/,,}!g" \

            

            

              412
              
		${WRKSRC}/config.m4

            

            

              413
              
. endif

            

        

          421
          
.endif

          414
          
.endif

        

        

          422
          

          415
          

        

        

          423
          
.if ${PHP_MODNAME} == "domxml"

          416
          
.if ${PHP_MODNAME} == "domxml"

        






  

  Return to bug 128467