From owner-freebsd-apache@FreeBSD.ORG  Fri Oct  1 15:13:51 2010
Return-Path: <owner-freebsd-apache@FreeBSD.ORG>
Delivered-To: apache@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 643851065675
	for <apache@FreeBSD.org>; Fri,  1 Oct 2010 15:13:51 +0000 (UTC)
	(envelope-from lidl@hydra.pix.net)
Received: from hydra.pix.net (hydra.pix.net [IPv6:2001:470:e254::3c])
	by mx1.freebsd.org (Postfix) with ESMTP id DC3928FC0C
	for <apache@FreeBSD.org>; Fri,  1 Oct 2010 15:13:50 +0000 (UTC)
Received: from hydra.pix.net (localhost [127.0.0.1])
	by hydra.pix.net (8.14.4/8.14.4) with ESMTP id o91FDnk6030929
	for <apache@FreeBSD.org>; Fri, 1 Oct 2010 11:13:49 -0400 (EDT)
	(envelope-from lidl@hydra.pix.net)
X-Virus-Status: Clean
X-Virus-Scanned: clamav-milter 0.96.3 at mail.pix.net
Received: (from lidl@localhost)
	by hydra.pix.net (8.14.4/8.14.4/Submit) id o91FDnHX030928
	for apache@FreeBSD.org; Fri, 1 Oct 2010 11:13:49 -0400 (EDT)
	(envelope-from lidl)
Date: Fri, 1 Oct 2010 11:13:49 -0400
From: Kurt Lidl <lidl@pix.net>
To: apache@FreeBSD.org
Message-ID: <20101001151348.GA30887@pix.net>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="FCuugMFkClbJLl1L"
Content-Disposition: inline
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: 
Subject: apr1 and bdb5.x
X-BeenThere: freebsd-apache@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Support of apache-related ports  <freebsd-apache.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-apache>, 
	<mailto:freebsd-apache-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-apache>
List-Post: <mailto:freebsd-apache@freebsd.org>
List-Help: <mailto:freebsd-apache-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-apache>,
	<mailto:freebsd-apache-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 01 Oct 2010 15:13:51 -0000


--FCuugMFkClbJLl1L
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Greetings.

I had some problem rebuilding my apache22 installation today
on one of my servers.  That machine uses bdb50, and the
compilation of the apr-util-1.3.9 fails when it encounters
the bdb50 db.h file.

The following patch file makes it work for me:

-Kurt


--FCuugMFkClbJLl1L
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="patch-apr-util-1.3.9-bdb5"

--- apr-util-1.3.9/dbm/apr_dbm_berkeleydb.c.orig	2008-11-21 03:22:35.000000000 -0500
+++ apr-util-1.3.9/dbm/apr_dbm_berkeleydb.c	2010-07-28 12:00:49.294755051 -0400
@@ -37,13 +37,13 @@
  * DB_185, DB2, DB3, and DB4.
  */
 
-#if   defined(DB_VERSION_MAJOR) && (DB_VERSION_MAJOR == 4)
+#if   defined(DB_VERSION_MAJOR) && (DB_VERSION_MAJOR >= 4)
 /* We will treat anything greater than 4.1 as DB4.
  * We can treat 4.0 as DB3.
  */
-#if   defined(DB_VERSION_MINOR) && (DB_VERSION_MINOR >= 1)
+#if   DB_VERSION_MAJOR > 4 || defined(DB_VERSION_MINOR) && (DB_VERSION_MINOR >= 1)
 #define DB_VER 4
-#else
+#elif DB_VERSION_MAJOR == 4
 #define DB_VER 3
 #endif
 #elif defined(DB_VERSION_MAJOR) && (DB_VERSION_MAJOR == 3)

--FCuugMFkClbJLl1L--