From owner-svn-ports-head@FreeBSD.ORG  Mon Aug 12 14:56:19 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 34200EB3;
 Mon, 12 Aug 2013 14:56:19 +0000 (UTC) (envelope-from ale@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 217442496;
 Mon, 12 Aug 2013 14:56:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7CEuI2s038655;
 Mon, 12 Aug 2013 14:56:18 GMT (envelope-from ale@svn.freebsd.org)
Received: (from ale@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7CEuI41038654;
 Mon, 12 Aug 2013 14:56:18 GMT (envelope-from ale@svn.freebsd.org)
Message-Id: <201308121456.r7CEuI41038654@svn.freebsd.org>
From: Alex Dupre <ale@FreeBSD.org>
Date: Mon, 12 Aug 2013 14:56:18 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r324634 - head/databases/php5-pdo_dblib/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Aug 2013 14:56:19 -0000

Author: ale
Date: Mon Aug 12 14:56:18 2013
New Revision: 324634
URL: http://svnweb.freebsd.org/changeset/ports/324634

Log:
  Rework patch to be similar to php 5.5.

Modified:
  head/databases/php5-pdo_dblib/files/patch-dblib_driver.c

Modified: head/databases/php5-pdo_dblib/files/patch-dblib_driver.c
==============================================================================
--- head/databases/php5-pdo_dblib/files/patch-dblib_driver.c	Mon Aug 12 14:45:23 2013	(r324633)
+++ head/databases/php5-pdo_dblib/files/patch-dblib_driver.c	Mon Aug 12 14:56:18 2013	(r324634)
@@ -1,15 +1,16 @@
---- dblib_driver.c.orig	2013-06-24 15:17:35.000000000 +0200
-+++ dblib_driver.c	2013-06-24 15:20:43.000000000 +0200
-@@ -274,9 +274,9 @@
+--- dblib_driver.c.orig	2013-08-12 16:49:42.000000000 +0200
++++ dblib_driver.c	2013-08-12 16:50:11.000000000 +0200
+@@ -274,9 +274,13 @@
  		,{"5.0",DBVERSION_70} /* FIXME: This does not work with Sybase, but environ will */
  		,{"6.0",DBVERSION_70}
  		,{"7.0",DBVERSION_70}
--		,{"7.1",DBVERSION_71}
--		,{"7.2",DBVERSION_72}
--		,{"8.0",DBVERSION_72}
-+		,{"7.1",DBVERSION_80}
-+		,{"7.2",DBVERSION_80}
-+		,{"8.0",DBVERSION_80}
++#ifdef DBVERSION_71
+ 		,{"7.1",DBVERSION_71}
++#endif
++#ifdef DBVERSION_72
+ 		,{"7.2",DBVERSION_72}
+ 		,{"8.0",DBVERSION_72}
++#endif
  		,{"10.0",DBVERSION_100}
  		,{"auto",0} /* Only works with FreeTDS. Other drivers will bork */