Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 12 Aug 2013 14:56:18 +0000 (UTC)
From:      Alex Dupre <ale@FreeBSD.org>
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
Message-ID:  <201308121456.r7CEuI41038654@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 */
  		



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308121456.r7CEuI41038654>