[Midnightbsd-cvs] mports: patch-config.m4: Update for php 5.2.4

[laffer1 at midnightbsd.org]

Log Message:
-----------
Update for php 5.2.4

Modified Files:
--------------
    mports/databases/php5-dba/files:
        patch-config.m4 (r1.1 -> r1.2)

-------------- next part --------------
Index: patch-config.m4
===================================================================
RCS file: /home/cvs/mports/databases/php5-dba/files/patch-config.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -Ldatabases/php5-dba/files/patch-config.m4 -Ldatabases/php5-dba/files/patch-config.m4 -u -r1.1 -r1.2
--- databases/php5-dba/files/patch-config.m4
+++ databases/php5-dba/files/patch-config.m4
@@ -1,48 +1,42 @@
---- config.m4.orig	Mon Aug  7 09:57:12 2006
-+++ config.m4	Sat Nov  4 11:18:16 2006
-@@ -244,6 +244,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
-+        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/db.h"; then
-         THIS_PREFIX=$i
-         THIS_INCLUDE=$i/include/db4/db.h
-@@ -493,7 +505,7 @@
-     PHP_DBA_STD_ATTACH
-   fi
- ],[
--  if test "$PHP_DBA" != "no" && test "$HAVE_DBA" = "1"; then
-+  if test "$PHP_DBA" != "no" || test "$HAVE_DBA" = "1"; then
-     PHP_DBA_BUILTIN_CDB
-   fi
- ])
-@@ -511,7 +523,7 @@
-     PHP_DBA_BUILTIN_INI
-   fi
- ],[
--  if test "$PHP_DBA" != "no" && test "$HAVE_DBA" = "1"; then
-+  if test "$PHP_DBA" != "no" || test "$HAVE_DBA" = "1"; then
-     PHP_DBA_BUILTIN_INI
-   fi
- ])
-@@ -532,7 +544,7 @@
-     PHP_DBA_BUILTIN_FLATFILE
-   fi
- ],[
--  if test "$PHP_DBA" != "no" && test "$HAVE_DBA" = "1"; then
-+  if test "$PHP_DBA" != "no" || test "$HAVE_DBA" = "1"; then
-     PHP_DBA_BUILTIN_FLATFILE
-   fi
- ])
+--- config.m4.orig	2007-07-19 12:50:16.000000000 +0200
++++ config.m4	2007-09-13 17:24:16.000000000 +0200
+@@ -279,6 +279,30 @@
+       THIS_PREFIX=$i
+       THIS_INCLUDE=$i/db4/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.5/db.h"; then
+       THIS_PREFIX=$i
+       THIS_INCLUDE=$i/include/db4.5/db.h
+@@ -301,7 +325,7 @@
+       break
+     fi
+   done
+-  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)])
++  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)])
+ fi
+ PHP_DBA_STD_RESULT(db4,Berkeley DB4)
+