From owner-svn-ports-head@freebsd.org  Tue Feb 16 15:38:23 2016
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 87EBFAAA9F6;
 Tue, 16 Feb 2016 15:38:23 +0000 (UTC)
 (envelope-from miwi@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 5608E1125;
 Tue, 16 Feb 2016 15:38:23 +0000 (UTC)
 (envelope-from miwi@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1GFcMmp046932;
 Tue, 16 Feb 2016 15:38:22 GMT (envelope-from miwi@FreeBSD.org)
Received: (from miwi@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1GFcMG3046930;
 Tue, 16 Feb 2016 15:38:22 GMT (envelope-from miwi@FreeBSD.org)
Message-Id: <201602161538.u1GFcMG3046930@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: miwi set sender to
 miwi@FreeBSD.org using -f
From: Martin Wilke <miwi@FreeBSD.org>
Date: Tue, 16 Feb 2016 15:38:22 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r409000 - head/lang/php70
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.20
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: Tue, 16 Feb 2016 15:38:23 -0000

Author: miwi
Date: Tue Feb 16 15:38:21 2016
New Revision: 409000
URL: https://svnweb.freebsd.org/changeset/ports/409000

Log:
  - Fix mysql[nd] library handling in php modules logic.
  
  Reported by: fluffy

Modified:
  head/lang/php70/Makefile
  head/lang/php70/Makefile.ext

Modified: head/lang/php70/Makefile
==============================================================================
--- head/lang/php70/Makefile	Tue Feb 16 15:19:17 2016	(r408999)
+++ head/lang/php70/Makefile	Tue Feb 16 15:38:21 2016	(r409000)
@@ -3,7 +3,7 @@
 
 PORTNAME=	php70
 PORTVERSION=	7.0.3
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES?=	lang devel www
 MASTER_SITES=	PHP/distributions
 DISTNAME=	php-${PORTVERSION}

Modified: head/lang/php70/Makefile.ext
==============================================================================
--- head/lang/php70/Makefile.ext	Tue Feb 16 15:19:17 2016	(r408999)
+++ head/lang/php70/Makefile.ext	Tue Feb 16 15:38:21 2016	(r409000)
@@ -239,17 +239,6 @@ CONFIGURE_ARGS+=--with-pdo-firebird=${LO
 USES+=	firebird
 USE_PHP=	pdo
 USE_PHP_BUILD=	yes
-
-.endif
-
-.if ${PHP_MODNAME} == "pdo_mysql"
-CONFIGURE_ARGS+=--with-pdo-mysql=mysqlnd
-USE_PHP=pdo
-USE_PHP_BUILD=	yes
-.else
-CONFIGURE_ARGS+=--with-pdo-mysql=${LOCALBASE} \
-		--with-zlib-dir=/usr
-USE_MYSQL=	yes
 .endif
 
 .if ${PHP_MODNAME} == "pdo_odbc"
@@ -546,6 +535,19 @@ USE_MYSQL=	yes
 .	endif
 .endif
 
+.if ${PHP_MODNAME} == "pdo_mysql"
+USE_PHP=pdo
+USE_PHP_BUILD=	yes
+.	if ${PORT_OPTIONS:MMYSQLND}
+CONFIGURE_ARGS+=--with-pdo-mysql=mysqlnd
+USE_PHP+=	mysqli
+.	else
+CONFIGURE_ARGS+=--with-pdo-mysql=${LOCALBASE} \
+		--with-zlib-dir=/usr
+USE_MYSQL=	yes
+.	endif
+.endif
+
 .if ${PHP_MODNAME} == "openssl" || ${PHP_MODNAME} == "sqlite3"
 post-extract:
 	@${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4