From owner-svn-ports-head@freebsd.org  Thu Jan 12 13:54:47 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 68ED0CAC5DA;
 Thu, 12 Jan 2017 13:54:47 +0000 (UTC) (envelope-from tz@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2A8681AAE;
 Thu, 12 Jan 2017 13:54:47 +0000 (UTC) (envelope-from tz@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0CDsk4R087072;
 Thu, 12 Jan 2017 13:54:46 GMT (envelope-from tz@FreeBSD.org)
Received: (from tz@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0CDskse087070;
 Thu, 12 Jan 2017 13:54:46 GMT (envelope-from tz@FreeBSD.org)
Message-Id: <201701121354.v0CDskse087070@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tz set sender to tz@FreeBSD.org
 using -f
From: Torsten Zuehlsdorff <tz@FreeBSD.org>
Date: Thu, 12 Jan 2017 13:54:46 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r431266 - in head/databases/php70-mysqli: . 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.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Jan 2017 13:54:47 -0000

Author: tz
Date: Thu Jan 12 13:54:46 2017
New Revision: 431266
URL: https://svnweb.freebsd.org/changeset/ports/431266

Log:
  databases/php70-mysqli: Add patch to build fine with databases/mysql80-client
  
  Patch enables the port to build with databases/mysql80-client
  
  PR:           215903
  Submitted by: Mahdi Mokhtari <mokhi64@gmail.com>

Added:
  head/databases/php70-mysqli/files/patch-mysqli.c   (contents, props changed)
Modified:
  head/databases/php70-mysqli/Makefile

Modified: head/databases/php70-mysqli/Makefile
==============================================================================
--- head/databases/php70-mysqli/Makefile	Thu Jan 12 13:50:09 2017	(r431265)
+++ head/databases/php70-mysqli/Makefile	Thu Jan 12 13:54:46 2017	(r431266)
@@ -7,4 +7,6 @@ MASTERDIR=	${.CURDIR}/../../lang/php70
 
 PKGNAMESUFFIX=	-mysqli
 
+PORTREVISION=	1
+
 .include "${MASTERDIR}/Makefile"

Added: head/databases/php70-mysqli/files/patch-mysqli.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/php70-mysqli/files/patch-mysqli.c	Thu Jan 12 13:54:46 2017	(r431266)
@@ -0,0 +1,11 @@
+--- mysqli.c.orig	2016-12-06 18:05:01 UTC
++++ mysqli.c
+@@ -703,7 +703,7 @@ PHP_MINIT_FUNCTION(mysqli)
+ #ifdef MYSQLND_STRING_TO_INT_CONVERSION
+ 	REGISTER_LONG_CONSTANT("MYSQLI_OPT_INT_AND_FLOAT_NATIVE", MYSQLND_OPT_INT_AND_FLOAT_NATIVE, CONST_CS | CONST_PERSISTENT);
+ #endif
+-#if MYSQL_VERSION_ID > 50110 || defined(MYSQLI_USE_MYSQLND)
++#if (MYSQL_VERSION_ID < 80000 && MYSQL_VERSION_ID > 50110) || defined(MYSQLI_USE_MYSQLND)
+ 	REGISTER_LONG_CONSTANT("MYSQLI_OPT_SSL_VERIFY_SERVER_CERT", MYSQL_OPT_SSL_VERIFY_SERVER_CERT, CONST_CS | CONST_PERSISTENT);
+ #endif
+