From owner-freebsd-apache@FreeBSD.ORG  Wed Apr 28 00:29:26 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 08D42106564A
	for <apache@freebsd.org>; Wed, 28 Apr 2010 00:29:26 +0000 (UTC)
	(envelope-from pgollucci@p6m7g8.com)
Received: from exhub015-2.exch015.msoutlookonline.net
	(exhub015-2.exch015.msoutlookonline.net [207.5.72.94])
	by mx1.freebsd.org (Postfix) with ESMTP id EAB4E8FC16
	for <apache@freebsd.org>; Wed, 28 Apr 2010 00:29:25 +0000 (UTC)
Received: from philip.hq.rws (174.79.184.239) by smtpx15.msoutlookonline.net
	(207.5.72.103) with Microsoft SMTP Server (TLS) id 8.2.234.1;
	Tue, 27 Apr 2010 17:29:25 -0700
Message-ID: <4BD78162.5080002@p6m7g8.com>
Date: Wed, 28 Apr 2010 00:29:22 +0000
From: "Philip M. Gollucci" <pgollucci@p6m7g8.com>
Organization: P6M7G8 Inc.
User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; en-US;
	rv:1.9.1.7) Gecko/20100220 Thunderbird/3.0.1
MIME-Version: 1.0
To: apache@freebsd.org
Content-Type: multipart/mixed; boundary="------------020607050700030907070805"
X-Content-Filtered-By: Mailman/MimeDel 2.1.5
Cc: 
Subject: Fwd: [PATCH] apr-util: Support db 5.0
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: Wed, 28 Apr 2010 00:29:26 -0000

--------------020607050700030907070805
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 7bit

I'll get to this eventually.

--- apr-util-1.3.9/dbm/apr_dbm_berkeleydb.c.ark	2010-04-14 
17:57:37.846342893 +0200
+++ apr-util-1.3.9/dbm/apr_dbm_berkeleydb.c	2010-04-14 
18:44:28.368839346 +0200
@@ -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)


-------- Original Message --------
Subject: [PATCH] apr-util: Support db 5.0
Date: Wed, 14 Apr 2010 19:06:30 +0200
From: Bernhard Rosenkraenzer <br@blankpage.ch>
Organization: BlankPage AG
To: <dev@apr.apache.org>

This patch adds support for Berkeley DB 5.0.x to apr-util.

ttyl
bero

--------------020607050700030907070805--