From 71baa84322d3877af589d118bf560790fdce81c7 Mon Sep 17 00:00:00 2001
From: Martin Wilke <miwi@FreeBSD.org>
Date: Thu, 18 Feb 2016 12:05:45 +0000
Subject: bsd.php.mk - Unbreak build for php70 - Cleanup php55/6 extenions -
 Put not existing php70 extentions to php55 and php56 extra defines

lang/php70
- Remove mysqli from pdo_mysql it's looping here and does not really depends on mysqli
- Bump PORTREVISION

This work has been done in collaboration with
- fluffy@
- Franco Fichtner
---
 Mk/bsd.php.mk           | 16 ++++++----------
 lang/php70/Makefile     |  2 +-
 lang/php70/Makefile.ext | 27 ++++++++++-----------------
 3 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/Mk/bsd.php.mk b/Mk/bsd.php.mk
index e427387340c1..309d44abee68 100644
--- a/Mk/bsd.php.mk
+++ b/Mk/bsd.php.mk
@@ -246,16 +246,16 @@ php-ini:
 _USE_PHP_ALL=	apc bcmath bitset bz2 calendar ctype curl dba dom \
 		exif fileinfo filter ftp gd gettext gmp \
 		hash iconv igbinary imap interbase intl json ldap mbstring mcrypt \
-		memcache mssql mysql mysqli odbc opcache \
+		memcache mysqli odbc opcache \
 		openssl pcntl pcre pdf pdo pdo_dblib pdo_firebird pdo_mysql \
-		pdo_odbc pdo_pgsql pdo_sqlite pgsql posix \
+		pdo_odbc pdo_pgsql pdo_sqlite phar pgsql posix \
 		pspell radius readline recode session shmop simplexml snmp soap\
-		sockets spl sybase_ct sysvmsg sysvsem sysvshm \
+		sockets spl sqlite3 sysvmsg sysvsem sysvshm \
 		tidy tokenizer wddx xml xmlreader xmlrpc xmlwriter xsl zip zlib
 # version specific components
-_USE_PHP_VER55=	${_USE_PHP_ALL} phar sqlite3
-_USE_PHP_VER56=	${_USE_PHP_ALL} phar sqlite3
-_USE_PHP_VER70=	${_USE_PHP_ALL} phar sqlite3
+_USE_PHP_VER55=	${_USE_PHP_ALL} mssql mysql sybase_ct
+_USE_PHP_VER56=	${_USE_PHP_ALL} mssql mysql sybase_ct
+_USE_PHP_VER70=	${_USE_PHP_ALL}
 
 apc_DEPENDS=	www/pecl-APC
 bcmath_DEPENDS=	math/php${PHP_VER}-bcmath
@@ -291,11 +291,7 @@ mcrypt_DEPENDS=	security/php${PHP_VER}-mcrypt
 memcache_DEPENDS=	databases/pecl-memcache
 mhash_DEPENDS=	security/php${PHP_VER}-mhash
 mssql_DEPENDS=	databases/php${PHP_VER}-mssql
-.if ${PHP_VER} == 55 || ${PHP_VER} == 56
 mysql_DEPENDS=	databases/php${PHP_VER}-mysql
-.else
-IGNORE=	databases/php${PHP_VER}-mysql is depricated. Please use mysqli or pdo_mysql instance.
-.endif
 mysqli_DEPENDS=	databases/php${PHP_VER}-mysqli
 ncurses_DEPENDS=devel/php${PHP_VER}-ncurses
 odbc_DEPENDS=	databases/php${PHP_VER}-odbc
diff --git a/lang/php70/Makefile b/lang/php70/Makefile
index 68eabe0f005d..f3c678f883d7 100644
--- a/lang/php70/Makefile
+++ b/lang/php70/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	php70
 PORTVERSION=	7.0.3
-PORTREVISION?=	3
+PORTREVISION?=	4
 CATEGORIES?=	lang devel www
 MASTER_SITES=	PHP/distributions
 DISTNAME=	php-${PORTVERSION}
diff --git a/lang/php70/Makefile.ext b/lang/php70/Makefile.ext
index ae25af4718fa..ad0d0bebc9de 100644
--- a/lang/php70/Makefile.ext
+++ b/lang/php70/Makefile.ext
@@ -249,6 +249,16 @@ USE_PHP=	pdo
 USE_PHP_BUILD=	yes
 .endif
 
+.if ${PHP_MODNAME} == "pdo_mysql"
+OPTIONS_DEFINE=	MYSQLND
+OPTIONS_DEFAULT=MYSQLND
+
+MYSQLND_DESC=	Use MySQL Native Driver
+
+USE_PHP=	pdo
+USE_PHP_BUILD=	yes
+.endif
+
 .if ${PHP_MODNAME} == "pdo_pgsql"
 USES+=		pgsql
 
@@ -530,17 +540,13 @@ CONFIGURE_ARGS+=--disable-mbregex
 CONFIGURE_ARGS+=--with-mysqli=mysqlnd
 .	else
 CONFIGURE_ARGS+=--with-mysqli=${LOCALBASE}/bin/mysql_config
-
 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
@@ -561,19 +567,6 @@ LIB_DEPENDS+=	libct.so:${PORTSDIR}/databases/freetds
 .	endif
 .endif
 
-.if ${PHP_MODNAME} == "pdo_mysql"
-.	if ${PORT_OPTIONS:MMYSQLND}
-CONFIGURE_ARGS+=--with-pdo-mysql=mysqlnd
-
-USE_PHP+=	mysql
-.	else
-CONFIGURE_ARGS+=--with-pdo-mysql=${LOCALBASE} \
-		--with-zlib-dir=/usr
-
-USE_MYSQL=	yes
-.	endif
-.endif
-
 .if ${PHP_MODNAME} == "xml"
 post-extract:
 	@${MKDIR} ${WRKSRC}/ext/xml
-- 
cgit v1.2.3