ports/76151: [ports/www/apache2] allow the use of Berkeley DB 4.3

[Sunpoet Po-Chuan Hsieh]

>Number:         76151
>Category:       ports
>Synopsis:       [ports/www/apache2] allow the use of Berkeley DB 4.3
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jan 12 16:00:49 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Sunpoet Po-Chuan Hsieh
>Release:        FreeBSD 6.0-CURRENT i386
>Organization:
SUNPOET.net
>Environment:
System: FreeBSD IRIS.sunpoet.net 6.0-CURRENT FreeBSD 6.0-CURRENT #0: Thu Dec 16 03:44:24 CST 2004 sunpoet at IRIS.sunpoet.net:/usr/src/sys/i386/compile/sunpoet i386

	
>Description:
Allow apache2 users to use Berkeley DB 4.3.

	
>How-To-Repeat:
	
>Fix:
- patch-srclib:apr-util:build:dbm.m4 is mis-named as patch-srclib:apr-utils:build:dbm.m4 in /usr/ports/www/apache2/files/.

- Replace patch-srclib:apr-util:build:dbm.m4 as follows:
% cat /usr/ports/www/apache2/files/patch-srclib:apr-util:build:dbm.m4
--- srclib/apr-util/build/dbm.m4.orig	Sat Mar 13 12:36:23 2004
+++ srclib/apr-util/build/dbm.m4	Wed Jan 12 23:09:49 2005
@@ -298,8 +298,8 @@
   fi
   APU_CHECK_BERKELEY_DB(1, -1, -1,
     "$places",
-    "db_185.h",
-    "db"
+    "db.h",
+    "c"
   )
   if test "$apu_have_db" = "1"; then
     apu_db_version=185
@@ -341,7 +341,7 @@
   APU_CHECK_BERKELEY_DB(3, -1, -1,
     "$places",
     "db3/db.h db.h",
-    "db3 db"
+    "db3"
   )
   if test "$apu_have_db" = "1"; then
     apu_db_version=3
@@ -361,8 +361,8 @@
   fi
   APU_CHECK_BERKELEY_DB("4", "0", "-1",
     "$places",
-    "db4/db.h db.h",
-    "db-4.0 db4 db"
+    "db4/db.h",
+    "db4"
   )
   if test "$apu_have_db" = "1"; then
     apu_db_version=4
@@ -382,8 +382,8 @@
   fi
   APU_CHECK_BERKELEY_DB("4", "1", "-1",
     "$places",
-    "db41/db.h db4/db.h db.h",
-    "db-4.1 db4 db"
+    "db41/db.h",
+    "db41"
   )
   if test "$apu_have_db" = "1"; then
     apu_db_version=4
@@ -403,8 +403,29 @@
   fi
   APU_CHECK_BERKELEY_DB("4", "2", "-1",
     "$places",
-    "db42/db.h db4/db.h db.h",
-    "db-4.2 db4 db"
+    "db42/db.h",
+    "db-4.2"
+  )
+  if test "$apu_have_db" = "1"; then
+    apu_db_version=4
+  fi
+])
+
+
+dnl
+dnl APU_CHECK_DB43: is DB4.3 present?
+dnl
+dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version
+dnl
+AC_DEFUN(APU_CHECK_DB43, [
+  places=$1
+  if test -z "$places"; then
+    places="std /usr/local/BerkeleyDB.4.3 /boot/home/config"
+  fi
+  APU_CHECK_BERKELEY_DB("4", "3", "-1",
+    "$places",
+    "db43/db.h",
+    "db-4.3"
   )
   if test "$apu_have_db" = "1"; then
     apu_db_version=4
@@ -465,6 +486,12 @@
       AC_MSG_ERROR(Berkeley db4 not found)
     fi
     ;;
+  db43)
+    APU_CHECK_DB43("$check_places")
+    if test "$apu_db_version" != "4"; then
+      AC_MSG_ERROR(Berkeley db4 not found)
+    fi
+    ;;
   default)
     APU_CHECK_DB_ALL("$check_places")
     ;;
@@ -472,24 +499,27 @@
 ])
 
 dnl
-dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.2 to 1.
+dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.3 to 1.
 dnl
 AC_DEFUN(APU_CHECK_DB_ALL, [
   all_places=$1
  
-  APU_CHECK_DB42("$all_places")
+  APU_CHECK_DB43("$all_places")
   if test "$apu_db_version" != "4"; then
-    APU_CHECK_DB41("$all_places")
+    APU_CHECK_DB42("$all_places")
     if test "$apu_db_version" != "4"; then
-      APU_CHECK_DB4("$all_places")
+      APU_CHECK_DB41("$all_places")
       if test "$apu_db_version" != "4"; then
-        APU_CHECK_DB3("$all_places")
-        if test "$apu_db_version" != "3"; then
-          APU_CHECK_DB2("$all_places")
-          if test "$apu_db_version" != "2"; then
-            APU_CHECK_DB1("$all_places")
-            if test "$apu_db_version" != "1"; then
-              APU_CHECK_DB185("$all_places")
+        APU_CHECK_DB4("$all_places")
+        if test "$apu_db_version" != "4"; then
+          APU_CHECK_DB3("$all_places")
+          if test "$apu_db_version" != "3"; then
+            APU_CHECK_DB2("$all_places")
+            if test "$apu_db_version" != "2"; then
+              APU_CHECK_DB1("$all_places")
+              if test "$apu_db_version" != "1"; then
+                APU_CHECK_DB185("$all_places")
+              fi
             fi
           fi
         fi
@@ -524,11 +554,11 @@
 
   AC_ARG_WITH(dbm, [
     --with-dbm=DBM          choose the DBM type to use.
-      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42}
+      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43}
   ], [
     if test "$withval" = "yes"; then
       AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use.
-        One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42])
+        One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43])
     fi
     requested="$withval"
   ], [
@@ -706,6 +736,10 @@
       apu_use_db=1
       apu_default_dbm=db4
       ;;
+    db43)
+      apu_use_db=1
+      apu_default_dbm=db4
+      ;;
     default)
       dnl ### use more sophisticated DBMs for the default?
       apu_default_dbm="sdbm (default)"
@@ -713,7 +747,7 @@
       ;;
     *)
       AC_MSG_ERROR([--with-dbm=$look_for is an unknown DBM type.
-        Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42])
+        Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43])
       ;;
   esac
 

	

>Release-Note:
>Audit-Trail:
>Unformatted: