From sunpoet@sunpoet.net  Fri Aug 26 06:04:04 2011
Return-Path: <sunpoet@sunpoet.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 34E7F106564A;
	Fri, 26 Aug 2011 06:04:04 +0000 (UTC)
	(envelope-from sunpoet@sunpoet.net)
Received: from sunpoet.net (sunpoet.net [220.133.12.240])
	by mx1.freebsd.org (Postfix) with ESMTP id 060208FC08;
	Fri, 26 Aug 2011 06:04:03 +0000 (UTC)
Received: by sunpoet.net (Postfix, from userid 1000)
	id 4C0CA743; Fri, 26 Aug 2011 14:03:31 +0800 (CST)
Message-Id: <20110826060331.4C0CA743@sunpoet.net>
Date: Fri, 26 Aug 2011 14:03:31 +0800 (CST)
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: ale@FreeBSD.org
Subject: [PATCH] databases/php5-dba: fix build with db5
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         160197
>Category:       ports
>Synopsis:       [PATCH] databases/php5-dba: fix build with db5
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    ale
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Aug 26 06:10:08 UTC 2011
>Closed-Date:    Fri Aug 26 07:34:09 UTC 2011
>Last-Modified:  Fri Aug 26 07:40:12 UTC 2011
>Originator:     Sunpoet Po-Chuan Hsieh
>Release:        FreeBSD 8.2-STABLE amd64
>Organization:
The FreeBSD Project
>Environment:
System: FreeBSD bonjour.sunpoet.net 8.2-STABLE FreeBSD 8.2-STABLE #0: Sat Jul  9 23:23:51 CST
>Description:
- Fix build with db5

Port maintainer (ale@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- php5-dba-5.3.8.patch begins here ---
Index: files/patch-config.m4
===================================================================
RCS file: /home/ncvs/ports/databases/php5-dba/files/patch-config.m4,v
retrieving revision 1.11
diff -u -u -r1.11 patch-config.m4
--- files/patch-config.m4	19 Aug 2011 09:33:30 -0000	1.11
+++ files/patch-config.m4	26 Aug 2011 06:03:05 -0000
@@ -1,9 +1,13 @@
---- config.m4.orig	2010-12-01 20:20:16.000000000 +0100
-+++ config.m4	2011-02-08 11:40:04.000000000 +0100
-@@ -285,6 +285,46 @@
+--- config.m4.orig	2011-06-28 04:28:30.000000000 +0800
++++ config.m4	2011-08-26 12:01:34.328413280 +0800
+@@ -285,6 +285,50 @@
        THIS_PREFIX=$i
        THIS_INCLUDE=$i/db4/db.h
        break
++    elif test -f "$i/include/db5/db.h"; then
++      THIS_PREFIX=$i
++      THIS_INCLUDE=$i/include/db5/db.h
++      break
 +    elif test -f "$i/include/db51/db.h"; then
 +      THIS_PREFIX=$i
 +      THIS_INCLUDE=$i/include/db51/db.h
@@ -47,3 +51,12 @@
      elif test -f "$i/include/db5.1/db.h"; then
        THIS_PREFIX=$i
        THIS_INCLUDE=$i/include/db5.1/db.h
+@@ -327,7 +371,7 @@
+       break
+     fi
+   done
+-  PHP_DBA_DB_CHECK(4, db-5.1 db-5.0 db-4.8 db-4.7 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)])
++  PHP_DBA_DB_CHECK(4, db-5.2 db-5.1 db-5.0 db-4.8 db-4.7 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)
+ 
--- php5-dba-5.3.8.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->ale 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Aug 26 06:10:18 UTC 2011 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=160197 
State-Changed-From-To: open->closed 
State-Changed-By: ale 
State-Changed-When: Fri Aug 26 07:33:55 UTC 2011 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=160197 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/160197: commit references a PR
Date: Fri, 26 Aug 2011 07:33:52 +0000 (UTC)

 ale         2011-08-26 07:33:43 UTC
 
   FreeBSD ports repository
 
   Modified files:
     databases/php5-dba/files patch-config.m4 
   Log:
   Add support for bdb 5.2.
   
   PR:             ports/160197
   Submitted by:   sunpoet
   
   Revision  Changes    Path
   1.12      +16 -3     ports/databases/php5-dba/files/patch-config.m4
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
