From john.marshall@riverwillow.com.au  Mon Aug 29 05:14:09 2011
Return-Path: <john.marshall@riverwillow.com.au>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 937B1106564A
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 29 Aug 2011 05:14:09 +0000 (UTC)
	(envelope-from john.marshall@riverwillow.com.au)
Received: from mail1.riverwillow.net.au (mail1.riverwillow.net.au [203.58.93.36])
	by mx1.freebsd.org (Postfix) with ESMTP id E1D468FC08
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 29 Aug 2011 05:14:08 +0000 (UTC)
Received: from rwpc13.mby.riverwillow.net.au (rwpc13.mby.riverwillow.net.au [172.25.24.197])
	(authenticated bits=0)
	by mail1.riverwillow.net.au (8.14.5/8.14.5) with ESMTP id p7T4x0Ai008507
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 29 Aug 2011 14:59:00 +1000 (AEST)
Received: from rwpc13.mby.riverwillow.net.au (john@localhost [127.0.0.1])
	by rwpc13.mby.riverwillow.net.au (8.14.5/8.14.5) with ESMTP id p7T4x01D003231
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 29 Aug 2011 14:59:00 +1000 (AEST)
	(envelope-from john.marshall@riverwillow.com.au)
Received: (from john@localhost)
	by rwpc13.mby.riverwillow.net.au (8.14.5/8.14.5/Submit) id p7T4wxtS003230;
	Mon, 29 Aug 2011 14:58:59 +1000 (AEST)
	(envelope-from john)
Message-Id: <201108290458.p7T4wxtS003230@rwpc13.mby.riverwillow.net.au>
Date: Mon, 29 Aug 2011 14:58:59 +1000 (AEST)
From: John Marshall <john.marshall@riverwillow.com.au>
Reply-To: John Marshall <john.marshall@riverwillow.com.au>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] net/openldap24-server: Support new BDB_VERSION numbers
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         160270
>Category:       ports
>Synopsis:       [PATCH] net/openldap24-server: Support new BDB_VERSION numbers
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    delphij
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Aug 29 05:20:10 UTC 2011
>Closed-Date:    Tue Mar 13 04:07:45 UTC 2012
>Last-Modified:  Tue Mar 13 04:07:45 UTC 2012
>Originator:     John Marshall
>Release:        FreeBSD 8.2-RELEASE i386
>Organization:
Riverwillow Pty Ltd
>Environment:
System: FreeBSD rwsrv05.mby.riverwillow.net.au 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Thu Feb 17 12:18:09 AEDT 2011 root@:/spare/obj/usr/src/sys/RWSRV05 i386


	
>Description:
	
As of the introduction of Berkeley DB 5.2 into the ports tree, the
BDB_VER numbering scheme has changed (see ports/159700) and
Mk/bsd.database.mk.  The OpenLDAP port's Makefile does not recognize the
new BDB_VER=5.

>How-To-Repeat:
	
Build port with WITH_BDB_VER=5 and watch it set --disable-bdb for
configure.
>Fix:

	
The attached patch teaches the Makefile to recognize BDB_VER=5.  Quite
likely the maintainer will want to do this differently in order to cater
for subsequent releases of Berkelye DB under the new BDB_VER numbering
scheme.

--- openldap24-server_2.4.26.diff begins here ---
--- openldap24-server/Makefile.orig	2011-07-21 05:02:02.000000000 +1000
+++ openldap24-server/Makefile	2011-08-29 12:06:05.000000000 +1000
@@ -323,7 +323,7 @@
 INVALID_BDB_VER=	42
 USE_BDB=		yes
 
-.if ${WITH_BDB_VER} >= 43
+.if ${WITH_BDB_VER} >= 43 || ${WITH_BDB_VER} == 5
 CONFIGURE_ARGS+=	--enable-bdb=${BACKEND_ENABLE} \
 			--enable-hdb=${BACKEND_ENABLE}
 PLIST_SUB+=		BACK_BDB=${BACKEND_PLIST} \
--- openldap24-server_2.4.26.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->delphij 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Aug 29 05:20:19 UTC 2011 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=160270 
State-Changed-From-To: open->closed 
State-Changed-By: delphij 
State-Changed-When: Tue Mar 13 04:07:33 UTC 2012 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=160270 
>Unformatted:
