[Midnightbsd-cvs] mports [21174] trunk/Mk/extensions/php.mk: update php build
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Mar 15 16:14:55 EDT 2016
Revision: 21174
http://svnweb.midnightbsd.org/mports/?rev=21174
Author: laffer1
Date: 2016-03-15 16:14:54 -0400 (Tue, 15 Mar 2016)
Log Message:
-----------
update php build
Modified Paths:
--------------
trunk/Mk/extensions/php.mk
Modified: trunk/Mk/extensions/php.mk
===================================================================
--- trunk/Mk/extensions/php.mk 2016-03-15 20:08:32 UTC (rev 21173)
+++ trunk/Mk/extensions/php.mk 2016-03-15 20:14:54 UTC (rev 21174)
@@ -50,21 +50,18 @@
DEFAULT_PHP_VER?= ${PHP_DEFAULT:S/.//}
PHP_VER?= ${DEFAULT_PHP_VER}
-.if ${PHP_VER} == 53
-PHP_EXT_DIR= 20090626
-PHP_EXT_INC= pcre spl
-.elif ${PHP_VER} == 56
+.if ${PHP_VER} == 70
+PHP_EXT_DIR= 20151012
+PHP_EXT_INC= pcre spl
+.elif ${PHP_VER} == 56
PHP_EXT_DIR= 20131226
PHP_EXT_INC= pcre spl
-.elif ${PHP_VER} == 55
+.elif ${PHP_VER} == 55
PHP_EXT_DIR= 20121212
PHP_EXT_INC= pcre spl
-.elif ${PHP_VER} == 54
-PHP_VER= 5
-PHP_EXT_DIR= 20100525
-PHP_EXT_INC= pcre spl
.else
-PHP_EXT_DIR= 20100525
+# default to DEFAULT_VERSIONS
+PHP_EXT_DIR= 20131226
PHP_EXT_INC= pcre spl
.endif
@@ -85,21 +82,18 @@
. endif
.endif
-. if defined(WITH_DEBUG)
+.if defined(WITH_DEBUG)
PHP_EXT_DIR:= ${PHP_EXT_DIR}-debug
-. endif
+.endif
PHP_SAPI?= ""
-.endif
-
+.endif # .if exists(${PHPBASE}/etc/php.conf)
PHP_EXT_INC?= ""
-PHP5_LAST_VER= 54
-
.if defined(IGNORE_WITH_PHP)
. for VER in ${IGNORE_WITH_PHP}
. if ${PHP_VER} == "${VER}"
IGNORE= cannot be installed: doesn't work with lang/php${PHP_VER} port\
- (doesn't support PHP ${IGNORE_WITH_PHP:C/^5$/${PHP5_LAST_VER}/:C/^5/5./})
+ (doesn't support PHP ${IGNORE_WITH_PHP:C/^5/5./})
. endif
. endfor
.endif
@@ -110,11 +104,6 @@
@${ECHO_CMD} "If you define WANT_PHP_WEB you cannot set also WANT_PHP_CGI"
@${ECHO_CMD} "or WANT_PHP_MOD. Use only one of them."
@${FALSE}
-. elif defined(PHP_VERSION) && ${PHP_VER} == 53 && ${PHP_SAPI:Mcgi} == "" && ${PHP_SAPI:Mfpm} == "" && ${PHP_SAPI:Mmod} == ""
-check-makevars::
- @${ECHO_CMD} "This port requires the Apache Module or the CGI version of PHP, but you have"
- @${ECHO_CMD} "already installed a PHP port without them."
- @${FALSE}
. endif
.endif
@@ -136,15 +125,6 @@
. endif
.endif
-.if defined(WANT_PHP_MOD)
-. if defined(PHP_VERSION) && ${PHP_VER} == 53 && ${PHP_SAPI:Mmod} == ""
-check-makevars::
- @${ECHO_CMD} "This port requires the Apache Module for PHP, but you have already"
- @${ECHO_CMD} "installed a PHP port without the Apache Module."
- @${FALSE}
-. endif
-.endif
-
.if defined(WANT_PHP_EMB)
. if defined(PHP_VERSION) && ${PHP_SAPI:Membed} == ""
check-makevars::
@@ -155,11 +135,7 @@
.endif
PHP_PORT?= lang/php${PHP_VER}
-.if ${PHP_VER} == 53
-MOD_PHP_PORT?= ${PHP_PORT}
-.else
MOD_PHP_PORT?= www/mod_php${PHP_VER}
-.endif
.if defined(USE_PHP_BUILD)
BUILD_DEPENDS+= ${PHPBASE}/include/php/main/php.h:${PORTSDIR}/${PHP_PORT}
@@ -231,7 +207,7 @@
>> ${TMPPLIST}
@${ECHO_CMD} "@unexec rm %D/include/php/ext/php_config.h.orig" \
>> ${TMPPLIST}
- @${ECHO_CMD} "@exec mkdir -p %D/etc/php" \
+ @${ECHO_CMD} "@dir etc/php" \
>> ${TMPPLIST}
.if defined(USE_ZENDEXT)
@${ECHO_CMD} "@exec echo zend_extension=%D/lib/php/${PHP_EXT_DIR}/${PHP_MODNAME}.so >> %D/etc/php/extensions.ini" \
@@ -253,8 +229,6 @@
>> ${TMPPLIST}
@${ECHO_CMD} "@unexec [ -s %D/etc/php/extensions.ini ] || rm %D/etc/php/extensions.ini" \
>> ${TMPPLIST}
- @${ECHO_CMD} "@unexec rmdir %D/etc/php 2> /dev/null || true" \
- >> ${TMPPLIST}
package-message: php-ini
@@ -279,21 +253,24 @@
_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_VER5= ${_USE_PHP_ALL} phar sqlite3
-_USE_PHP_VER53= ${_USE_PHP_ALL} phar sqlite sqlite3
-_USE_PHP_VER55= ${_USE_PHP_ALL} phar sqlite3
-_USE_PHP_VER56= ${_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
+.if ${PHP_VER} == 70
bitset_DEPENDS= math/pecl-bitset
+.else
+bitset_DEPENDS= math/pecl-bitset2
+.endif
bz2_DEPENDS= archivers/php${PHP_VER}-bz2
calendar_DEPENDS= misc/php${PHP_VER}-calendar
ctype_DEPENDS= textproc/php${PHP_VER}-ctype
@@ -313,7 +290,11 @@
igbinary_DEPENDS= converters/pecl-igbinary
imap_DEPENDS= mail/php${PHP_VER}-imap
interbase_DEPENDS= databases/php${PHP_VER}-interbase
+.if ${PHP_VER} == 70
+intl_DEPENDS= devel/php${PHP_VER}-intl
+.else
intl_DEPENDS= devel/pecl-intl
+.endif
json_DEPENDS= devel/php${PHP_VER}-json
ldap_DEPENDS= net/php${PHP_VER}-ldap
mbstring_DEPENDS= converters/php${PHP_VER}-mbstring
@@ -326,14 +307,9 @@
ncurses_DEPENDS=devel/php${PHP_VER}-ncurses
odbc_DEPENDS= databases/php${PHP_VER}-odbc
oci8_DEPENDS= databases/php${PHP_VER}-oci8
-.if ${PHP_VER} == 55 || ${PHP_VER} == 56
opcache_DEPENDS= www/php${PHP_VER}-opcache
-.else
-opcache_DEPENDS= www/pecl-zendopcache
-.endif
openssl_DEPENDS=security/php${PHP_VER}-openssl
pcntl_DEPENDS= devel/php${PHP_VER}-pcntl
-pcre_DEPENDS= devel/php${PHP_VER}-pcre
pdf_DEPENDS= print/pecl-pdflib
pdo_DEPENDS= databases/php${PHP_VER}-pdo
pdo_dblib_DEPENDS= databases/php${PHP_VER}-pdo_dblib
More information about the Midnightbsd-cvs
mailing list