svn commit: r409000 - head/lang/php70
Martin Wilke
miwi at FreeBSD.org
Tue Feb 16 15:38:23 UTC 2016
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
More information about the svn-ports-head
mailing list