From nobody@FreeBSD.org  Fri Apr 22 08:46:43 2011
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B2CD71065670
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 22 Apr 2011 08:46:43 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id A22048FC16
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 22 Apr 2011 08:46:43 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p3M8khPc023043
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 22 Apr 2011 08:46:43 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id p3M8khLI023042;
	Fri, 22 Apr 2011 08:46:43 GMT
	(envelope-from nobody)
Message-Id: <201104220846.p3M8khLI023042@red.freebsd.org>
Date: Fri, 22 Apr 2011 08:46:43 GMT
From: Pietro Cerutti <gahr@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] databases/php5-odbc -- implement option to choose iodbc / unixodbc backend
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         156564
>Category:       ports
>Synopsis:       [patch] databases/php5-odbc -- implement option to choose iodbc / unixodbc backend
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    ale
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Apr 22 08:50:05 UTC 2011
>Closed-Date:    Tue Apr 26 12:06:23 UTC 2011
>Last-Modified:  Tue Apr 26 12:10:11 UTC 2011
>Originator:     Pietro Cerutti
>Release:        
>Organization:
The FreeBSD Project
>Environment:
>Description:

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile.ext
===================================================================
RCS file: /home/pcvs/ports/lang/php5/Makefile.ext,v
retrieving revision 1.79
diff -u -r1.79 Makefile.ext
--- Makefile.ext	15 Apr 2011 14:52:14 -0000	1.79
+++ Makefile.ext	22 Apr 2011 08:40:17 -0000
@@ -194,9 +194,7 @@
 .endif
 
 .if ${PHP_MODNAME} == "odbc"
-LIB_DEPENDS+=	odbc.1:${PORTSDIR}/databases/unixODBC
-
-CONFIGURE_ARGS+=--with-unixODBC=${LOCALBASE}
+OPTIONS=	IODBC "Use the IODBC driver instead of UnixODBC" off
 .endif
 
 .if ${PHP_MODNAME} == "openssl"
@@ -560,3 +558,12 @@
 post-extract:
 	@${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4
 .endif
+
+.if ${PHP_MODNAME} == "odbc"
+.if defined(WITH_IODBC)
+LIB_DEPENDS+=	iodbc.3:${PORTSDIR}/databases/libiodbc
+.else
+LIB_DEPENDS+=	odbc.1:${PORTSDIR}/databases/unixODBC
+CONFIGURE_ARGS+=--with-unixODBC=${LOCALBASE}
+.endif
+.endif


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->ale 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Apr 22 08:50:14 UTC 2011 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=156564 
State-Changed-From-To: open->closed 
State-Changed-By: ale 
State-Changed-When: Tue Apr 26 12:06:08 UTC 2011 
State-Changed-Why:  
Committed, thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/156564: commit references a PR
Date: Tue, 26 Apr 2011 12:06:06 +0000 (UTC)

 ale         2011-04-26 12:05:58 UTC
 
   FreeBSD ports repository
 
   Modified files:
     databases/php5-odbc/files patch-config.m4 
     lang/php5            Makefile.ext 
     lang/php5-extensions Makefile 
   Log:
   Add support for iODBC (in addition to [default] unixODBC) in php5-odbc and
   php-pdo_odbc extensions.
   
   PR:             ports/156564
   Submitted by:   gahr
   
   Revision  Changes    Path
   1.2       +21 -16    ports/databases/php5-odbc/files/patch-config.m4
   1.22      +1 -1      ports/lang/php5-extensions/Makefile
   1.80      +27 -5     ports/lang/php5/Makefile.ext
 _______________________________________________
 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:
