Index: branches/2018Q4/converters/php71-mbstring/files/patch-config.m4 =================================================================== --- branches/2018Q4/converters/php71-mbstring/files/patch-config.m4 (revision 485068) +++ branches/2018Q4/converters/php71-mbstring/files/patch-config.m4 (revision 485069) @@ -1,51 +1,51 @@ ---- config.m4.orig 2009-11-25 02:30:06.000000000 +0100 -+++ config.m4 2010-04-12 09:59:54.000000000 +0200 -@@ -43,6 +43,30 @@ +--- config.m4.orig 2018-11-10 15:21:47.103604000 +0100 ++++ config.m4 2018-11-10 15:24:23.615118000 +0100 +@@ -42,6 +42,30 @@ AC_DEFUN([PHP_MBSTRING_EXTENSION], [ + PHP_ADD_INCLUDE([$ext_srcdir/$dir]) PHP_ADD_INCLUDE([$ext_builddir/$dir]) done - ++ + dnl This is PECL build, check if bundled PCRE library is used + old_CPPFLAGS=$CPPFLAGS + CPPFLAGS=$INCLUDES + AC_EGREP_CPP(yes,[ +#include
+#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE) +yes +#endif + ],[ + PHP_PCRE_REGEX=yes + ],[ + AC_EGREP_CPP(yes,[ +#include
+#if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE) +yes +#endif + ],[ + PHP_PCRE_REGEX=pecl + PHP_ADD_INCLUDE($PHP_PCRE_DIR/include) + ],[ + PHP_PCRE_REGEX=no + ]) + ]) -+ + if test "$ext_shared" = "no"; then PHP_ADD_SOURCES(PHP_EXT_DIR(mbstring), $PHP_MBSTRING_BASE_SOURCES) - out="php_config.h" -@@ -80,7 +104,6 @@ +@@ -85,7 +109,6 @@ AC_DEFUN([PHP_MBSTRING_SETUP_MBREGEX], [ int foo(int x, ...) { va_list va; va_start(va, x); - va_arg(va, int); va_arg(va, char *); va_arg(va, double); return 0; -@@ -347,6 +370,9 @@ +@@ -367,6 +390,9 @@ PHP_ARG_WITH(onig, [for external oniguru [ --with-onig[=DIR] MBSTRING: Use external oniguruma. DIR is the oniguruma install prefix. - If DIR is not set, the bundled oniguruma will be used], no, no) + If DIR is not set, the bundled oniguruma will be used], no, no) +PHP_ARG_WITH(pcre-dir, pcre install prefix, +[ --with-pcre-dir MBSTRING: pcre install prefix], no, no) + - if test "$PHP_MBSTRING" != "no"; then + if test "$PHP_MBSTRING" != "no"; then AC_DEFINE([HAVE_MBSTRING],1,[whether to have multibyte string support]) Index: branches/2018Q4/databases/php71-odbc/files/patch-config.m4 =================================================================== --- branches/2018Q4/databases/php71-odbc/files/patch-config.m4 (revision 485068) +++ branches/2018Q4/databases/php71-odbc/files/patch-config.m4 (revision 485069) @@ -1,129 +1,128 @@ ---- config.m4.orig 2016-10-25 15:23:21 UTC -+++ config.m4 -@@ -100,13 +100,17 @@ dnl +--- config.m4.orig 2018-11-10 15:32:27.031531000 +0100 ++++ config.m4 2018-11-10 15:37:40.815007000 +0100 +@@ -100,13 +100,16 @@ dnl dnl configure options dnl +PHP_ARG_ENABLE(odbc,, +[ --enable-odbc Enable ODBC support with selected driver]) + -+ PHP_ARG_WITH(odbcver,, [ --with-odbcver[=HEX] Force support for the passed ODBC version. A hex number is expected, default 0x0350. Use the special value of 0 to prevent an explicit ODBCVER to be defined. ], 0x0350) if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(adabas,, -[ --with-adabas[=DIR] Include Adabas D support [/usr/local]]) +[ --with-adabas[=DIR] Include Adabas D support [/usr/local]], no, no) AC_MSG_CHECKING([for Adabas support]) if test "$PHP_ADABAS" != "no"; then -@@ -135,7 +139,7 @@ fi +@@ -135,7 +138,7 @@ fi if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(sapdb,, -[ --with-sapdb[=DIR] Include SAP DB support [/usr/local]]) +[ --with-sapdb[=DIR] Include SAP DB support [/usr/local]], no, no) AC_MSG_CHECKING([for SAP DB support]) if test "$PHP_SAPDB" != "no"; then -@@ -155,7 +159,7 @@ fi +@@ -155,7 +158,7 @@ fi if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(solid,, -[ --with-solid[=DIR] Include Solid support [/usr/local/solid]]) +[ --with-solid[=DIR] Include Solid support [/usr/local/solid]], no, no) AC_MSG_CHECKING(for Solid support) if test "$PHP_SOLID" != "no"; then -@@ -182,7 +186,7 @@ fi +@@ -182,7 +185,7 @@ fi if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(ibm-db2,, -[ --with-ibm-db2[=DIR] Include IBM DB2 support [/home/db2inst1/sqllib]]) +[ --with-ibm-db2[=DIR] Include IBM DB2 support [/home/db2inst1/sqllib]], no, no) AC_MSG_CHECKING(for IBM DB2 support) if test "$PHP_IBM_DB2" != "no"; then -@@ -221,7 +225,7 @@ fi +@@ -221,7 +224,7 @@ fi if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(ODBCRouter,, -[ --with-ODBCRouter[=DIR] Include ODBCRouter.com support [/usr]]) +[ --with-ODBCRouter[=DIR] Include ODBCRouter.com support [/usr]], no, no) AC_MSG_CHECKING(for ODBCRouter.com support) if test "$PHP_ODBCROUTER" != "no"; then -@@ -244,7 +248,7 @@ fi +@@ -244,7 +247,7 @@ fi if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(empress,, [ --with-empress[=DIR] Include Empress support [\$EMPRESSPATH] - (Empress Version >= 8.60 required)]) + (Empress Version >= 8.60 required)], no, no) AC_MSG_CHECKING(for Empress support) if test "$PHP_EMPRESS" != "no"; then -@@ -270,7 +274,7 @@ if test -z "$ODBC_TYPE"; then +@@ -270,7 +273,7 @@ if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(empress-bcs,, [ --with-empress-bcs[=DIR] Include Empress Local Access support [\$EMPRESSPATH] - (Empress Version >= 8.60 required)]) + (Empress Version >= 8.60 required)], no, no) AC_MSG_CHECKING(for Empress local access support) if test "$PHP_EMPRESS_BCS" != "no"; then -@@ -310,7 +314,7 @@ fi +@@ -310,7 +313,7 @@ fi if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(birdstep,, -[ --with-birdstep[=DIR] Include Birdstep support [/usr/local/birdstep]]) +[ --with-birdstep[=DIR] Include Birdstep support [/usr/local/birdstep]], no, no) - + AC_MSG_CHECKING(for Birdstep support) if test "$PHP_BIRDSTEP" != "no"; then -@@ -366,7 +370,7 @@ PHP_ARG_WITH(custom-odbc,, +@@ -366,7 +369,7 @@ PHP_ARG_WITH(custom-odbc,, running this configure script: CPPFLAGS=\"-DODBC_QNX -DSQLANY_BUG\" LDFLAGS=-lunix - CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\"]) + CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\"], no, no) AC_MSG_CHECKING(for a custom ODBC support) if test "$PHP_CUSTOM_ODBC" != "no"; then -@@ -388,7 +392,7 @@ fi +@@ -388,7 +391,7 @@ fi if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(iodbc,, -[ --with-iodbc[=DIR] Include iODBC support [/usr/local]]) +[ --with-iodbc[=DIR] Include iODBC support [/usr/local]], no, no) AC_MSG_CHECKING(for iODBC support) if test "$PHP_IODBC" != "no"; then -@@ -426,7 +430,7 @@ fi +@@ -426,7 +429,7 @@ fi if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(esoob,, -[ --with-esoob[=DIR] Include Easysoft OOB support [/usr/local/easysoft/oob/client]]) +[ --with-esoob[=DIR] Include Easysoft OOB support [/usr/local/easysoft/oob/client]], no, no) AC_MSG_CHECKING(for Easysoft ODBC-ODBC Bridge support) if test "$PHP_ESOOB" != "no"; then -@@ -448,7 +452,7 @@ fi +@@ -448,7 +451,7 @@ fi if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(unixODBC,, -[ --with-unixODBC[=DIR] Include unixODBC support [/usr/local]]) +[ --with-unixODBC[=DIR] Include unixODBC support [/usr/local]], no, no) AC_MSG_CHECKING(for unixODBC support) if test "$PHP_UNIXODBC" != "no"; then -@@ -471,7 +475,7 @@ fi +@@ -471,7 +474,7 @@ fi if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(dbmaker,, -[ --with-dbmaker[=DIR] Include DBMaker support]) +[ --with-dbmaker[=DIR] Include DBMaker support], no, no) AC_MSG_CHECKING(for DBMaker support) if test "$PHP_DBMAKER" != "no"; then Index: branches/2018Q4/lang/php71/Makefile =================================================================== --- branches/2018Q4/lang/php71/Makefile (revision 485068) +++ branches/2018Q4/lang/php71/Makefile (revision 485069) @@ -1,191 +1,191 @@ # Created by: Torsten Zuehlsdorff # $FreeBSD$ PORTNAME= php71 -PORTVERSION= 7.1.22 +PORTVERSION= 7.1.24 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions DISTNAME= php-${PORTVERSION} MAINTAINER= tz@FreeBSD.org COMMENT= PHP Scripting Language LICENSE= PHP301 USES+= tar:xz cpe CPE_PRODUCT= php NO_OPTIONS_SORT=yes .if !defined(PKGNAMESUFFIX) LIB_DEPENDS= libpcre.so:devel/pcre GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-layout=GNU \ --with-config-file-scan-dir=${PREFIX}/etc/php \ --disable-all \ --enable-libxml \ --enable-mysqlnd \ --with-libxml-dir=${LOCALBASE} \ --with-pcre-regex=${LOCALBASE} \ --program-prefix="" USES+= autoreconf:build USE_GNOME= libxml2 # PR230207 Allow relocations against read-only segments (override lld default) LDFLAGS_i386= -Wl,-z,notext OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 MAILHEAD LINKTHR ZTS OPTIONS_DEFAULT=CLI CGI FPM EMBED LINKTHR DTRACE OPTIONS_EXCLUDE_DragonFly= DTRACE # ld(1) fails to link probes: Relocations in generic ELF (EM: 0) OPTIONS_EXCLUDE_aarch64= DTRACE # dt_modtext:opensolaris/ib/libdtrace/common/dt_link.c: arm not impemented OPTIONS_EXCLUDE_armv6= DTRACE OPTIONS_EXCLUDE_armv7= DTRACE # Bug 197128: No ASM code for MIPS/MIPS64, disable FPM OPTIONS_EXCLUDE_mips= DTRACE FPM OPTIONS_EXCLUDE_mips64= DTRACE FPM OPTIONS_EXCLUDE_sparc64= DTRACE OPTIONS_SUB= yes CLI_DESC= Build CLI version CGI_DESC= Build CGI version FPM_DESC= Build FPM version EMBED_DESC= Build embedded library PHPDBG_DESC= Interactive PHP debugger MAILHEAD_DESC= Enable mail header patch LINKTHR_DESC= Link thread lib (for threaded extensions) ZTS_DESC= Force Zend Thread Safety (ZTS) build CONFLICTS= php56-* php70-* php72-* DESTDIRNAME= INSTALL_ROOT .include PATCH_DIST_STRIP= -p1 .if ${PORT_OPTIONS:MMAILHEAD} PATCHFILES+= php-7.1.x-mail-header.patch:mail PATCH_SITES+= http://choon.net/opensource/php/:mail .endif .if ${PORT_OPTIONS:MCLI} PHP_SAPI+= cli .else CONFIGURE_ARGS+=--disable-cli .endif .if ${PORT_OPTIONS:MCGI} PHP_SAPI+= cgi .else CONFIGURE_ARGS+=--disable-cgi .endif .if ${PORT_OPTIONS:MFPM} PHP_SAPI+= fpm USE_RC_SUBR+= php-fpm CONFIGURE_ARGS+=--enable-fpm \ --with-fpm-user=${WWWOWN} \ --with-fpm-group=${WWWGRP} .endif .if defined(PKGNAMEPREFIX) USES+= apache:2.2+ .include "${PORTSDIR}/Mk/Uses/apache.mk" .if ${PORT_OPTIONS:MAP2FILTER} CONFIGURE_ARGS+=--with-apxs2filter=${APXS} .else CONFIGURE_ARGS+=--with-apxs2=${APXS} .endif PLIST= ${PKGDIR}/pkg-plist.mod PKGMESSAGE= ${PKGDIR}/pkg-message.mod MODULENAME= libphp7 SHORTMODNAME= php7 WARNING= "!!! If you have a threaded Apache, you must build ${PHP_PORT} with ZTS support to enable thread-safety in extensions !!!" .endif .if ${PORT_OPTIONS:MEMBED} PHP_SAPI+= embed CONFIGURE_ARGS+=--enable-embed .endif .if ${PORT_OPTIONS:MPHPDBG} PHP_SAPI+= phpdbg CONFIGURE_ARGS+=--enable-phpdbg .if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+=--enable-phpdbg-debug .endif .endif .if ${PORT_OPTIONS:MCLI} || ${PORT_OPTIONS:MEMBED} PLIST_SUB+= SAPI_INC="" .else PLIST_SUB+= SAPI_INC="@comment " .endif CONFIGURE_ENV+= ac_cv_decimal_fp_supported="no" \ lt_cv_path_SED="sed" .if ${PORT_OPTIONS:MLINKTHR} LIBS+= -lpthread .endif .if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+=--enable-debug .endif .if ${PORT_OPTIONS:MZTS} CONFIGURE_ARGS+=--enable-maintainer-zts CONFIGURE_ENV+= pthreads_working="yes" .endif .if ${PORT_OPTIONS:MDTRACE} CONFIGURE_ARGS+=--enable-dtrace PLIST_SUB+= DTRACE="" .else PLIST_SUB+= DTRACE="@comment " .endif .if empty(PORT_OPTIONS:MIPV6) CONFIGURE_ARGS+=--disable-ipv6 .endif post-patch: @${TOUCH} ${WRKSRC}/ext/php_config.h @${REINPLACE_CMD} "s|^\(extension_dir\)|; \1|" ${WRKSRC}/php.ini-* .if ${PORT_OPTIONS:MFPM} @${REINPLACE_CMD} -e "s|^;\(pid\)|\1|;s|^;\(pm\.[a-z_]*_servers\)|\1|" \ ${WRKSRC}/sapi/fpm/php-fpm.conf.in .endif pre-configure: @(cd ${WRKSRC} && ${SETENV} MAKE=${MAKE_CMD} ./buildconf --force) .if !defined(PKGNAMEPREFIX) post-build: @${ECHO_CMD} "PHP_VER=71" > ${WRKDIR}/php.conf @${ECHO_CMD} "PHP_VERSION=${PORTVERSION}" >> ${WRKDIR}/php.conf @${ECHO_CMD} "PHP_SAPI=${PHP_SAPI}" >> ${WRKDIR}/php.conf @${ECHO_CMD} "PHP_EXT_INC=pcre spl" >> ${WRKDIR}/php.conf @${ECHO_CMD} -n "PHP_EXT_DIR=" >> ${WRKDIR}/php.conf @${SH} ${WRKSRC}/scripts/php-config --extension-dir | ${SED} -ne 's,^${PREFIX}/lib/php/,,p' >> ${WRKDIR}/php.conf test: build @(cd ${WRKSRC} && ${MAKE} test) post-install: ${INSTALL_DATA} ${WRKSRC}/php.ini-development ${WRKSRC}/php.ini-production \ ${WRKDIR}/php.conf ${STAGEDIR}/${PREFIX}/etc .else do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR} ${INSTALL_LIB} ${WRKSRC}/libs/${MODULENAME}.so \ ${STAGEDIR}${PREFIX}/${APACHEMODDIR} .endif .else .include "${MASTERDIR}/Makefile.ext" .endif .include Index: branches/2018Q4/lang/php71/distinfo =================================================================== --- branches/2018Q4/lang/php71/distinfo (revision 485068) +++ branches/2018Q4/lang/php71/distinfo (revision 485069) @@ -1,5 +1,5 @@ -TIMESTAMP = 1537018543 -SHA256 (php-7.1.22.tar.xz) = 9194c9b3a592d8376fde837dde711ec01ee26f8607fc2884047ef6f7c089b15d -SIZE (php-7.1.22.tar.xz) = 12227848 +TIMESTAMP = 1542299453 +SHA256 (php-7.1.24.tar.xz) = e70dcec0ae28b6bc308b78972ec15aa850808819cc765f505aa51e5a7e2fa5d7 +SIZE (php-7.1.24.tar.xz) = 12205112 SHA256 (php-7.1.x-mail-header.patch) = 8f173d89672f7ebfabfcc3c5d7f8dec1c4243aba665db4b4046e67c34d9d4dc7 SIZE (php-7.1.x-mail-header.patch) = 4504 Index: branches/2018Q4/textproc/php71-simplexml/files/patch-config.m4 =================================================================== --- branches/2018Q4/textproc/php71-simplexml/files/patch-config.m4 (revision 485068) +++ branches/2018Q4/textproc/php71-simplexml/files/patch-config.m4 (revision 485069) @@ -1,43 +1,43 @@ ---- config.m4.orig 2014-05-14 10:14:22.929420181 +0000 -+++ config.m4 2014-05-14 10:15:36.967414693 +0000 -@@ -4,6 +4,9 @@ +--- config.m4.orig 2018-11-09 21:17:02.404698000 +0100 ++++ config.m4 2018-11-09 21:18:57.799985000 +0100 +@@ -4,6 +4,9 @@ dnl config.m4 for extension simplexml PHP_ARG_ENABLE(simplexml, whether to enable SimpleXML support, [ --disable-simplexml Disable SimpleXML support], yes) +PHP_ARG_WITH(pcre-dir, pcre install prefix, +[ --with-pcre-dir SimpleXML: pcre install prefix], no, no) + if test -z "$PHP_LIBXML_DIR"; then PHP_ARG_WITH(libxml-dir, libxml2 install dir, - [ --with-libxml-dir=DIR SimpleXML: libxml2 install prefix], no, no) -@@ -11,6 +14,30 @@ + [ --with-libxml-dir=DIR SimpleXML: libxml2 install prefix], no, no) +@@ -11,6 +14,30 @@ fi if test "$PHP_SIMPLEXML" != "no"; then + dnl This is PECL build, check if bundled PCRE library is used + old_CPPFLAGS=$CPPFLAGS + CPPFLAGS=$INCLUDES + AC_EGREP_CPP(yes,[ +#include
+#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE) +yes +#endif + ],[ + PHP_PCRE_REGEX=yes + ],[ + AC_EGREP_CPP(yes,[ +#include
+#if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE) +yes +#endif + ],[ + PHP_PCRE_REGEX=pecl + PHP_ADD_INCLUDE($PHP_PCRE_DIR/include) + ],[ + PHP_PCRE_REGEX=no + ]) + ]) + - if test "$PHP_LIBXML" = "no"; then - AC_MSG_ERROR([SimpleXML extension requires LIBXML extension, add --enable-libxml]) + if test "$PHP_LIBXML" = "no"; then + AC_MSG_ERROR([SimpleXML extension requires LIBXML extension, add --enable-libxml]) fi Index: branches/2018Q4 =================================================================== --- branches/2018Q4 (revision 485068) +++ branches/2018Q4 (revision 485069) Property changes on: branches/2018Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r485015