From owner-svn-ports-head@freebsd.org Thu Feb 18 12:05:47 2016 Return-Path: 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 25F10AAC40A; Thu, 18 Feb 2016 12:05:47 +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 F2DD215DC; Thu, 18 Feb 2016 12:05:46 +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 u1IC5kAA041641; Thu, 18 Feb 2016 12:05:46 GMT (envelope-from miwi@FreeBSD.org) Received: (from miwi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1IC5jEk041637; Thu, 18 Feb 2016 12:05:45 GMT (envelope-from miwi@FreeBSD.org) Message-Id: <201602181205.u1IC5jEk041637@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: miwi set sender to miwi@FreeBSD.org using -f From: Martin Wilke Date: Thu, 18 Feb 2016 12:05:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r409103 - in head: Mk 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Feb 2016 12:05:47 -0000 Author: miwi Date: Thu Feb 18 12:05:45 2016 New Revision: 409103 URL: https://svnweb.freebsd.org/changeset/ports/409103 Log: 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 Modified: head/Mk/bsd.php.mk head/lang/php70/Makefile head/lang/php70/Makefile.ext Modified: head/Mk/bsd.php.mk ============================================================================== --- head/Mk/bsd.php.mk Thu Feb 18 09:48:24 2016 (r409102) +++ head/Mk/bsd.php.mk Thu Feb 18 12:05:45 2016 (r409103) @@ -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}-m 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 Modified: head/lang/php70/Makefile ============================================================================== --- head/lang/php70/Makefile Thu Feb 18 09:48:24 2016 (r409102) +++ head/lang/php70/Makefile Thu Feb 18 12:05:45 2016 (r409103) @@ -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} Modified: head/lang/php70/Makefile.ext ============================================================================== --- head/lang/php70/Makefile.ext Thu Feb 18 09:48:24 2016 (r409102) +++ head/lang/php70/Makefile.ext Thu Feb 18 12:05:45 2016 (r409103) @@ -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}/datab . 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