Index: branches/2016Q2/lang/php55/Makefile =================================================================== --- branches/2016Q2/lang/php55/Makefile (revision 415972) +++ branches/2016Q2/lang/php55/Makefile (revision 415973) @@ -1,205 +1,205 @@ # Created by: Alex Dupre # $FreeBSD$ PORTNAME= php55 -PORTVERSION= 5.5.35 +PORTVERSION= 5.5.36 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions DISTNAME= php-${PORTVERSION} MAINTAINER= ale@FreeBSD.org COMMENT= PHP Scripting Language LICENSE= PHP301 USES= tar:bzip2 cpe CPE_PRODUCT= php NO_OPTIONS_SORT=yes .if !defined(PKGNAMESUFFIX) USE_AUTOTOOLS= autoconf LIB_DEPENDS= libpcre.so:devel/pcre CONFIGURE_ARGS+=--with-layout=GNU \ --localstatedir=/var \ --with-config-file-scan-dir=${PREFIX}/etc/php \ --disable-all \ --enable-libxml \ --enable-mysqlnd \ --with-libxml-dir=${LOCALBASE} \ --with-pcre-regex=${LOCALBASE} \ --with-zlib-dir=/usr \ --program-prefix="" USE_GNOME= libxml2 OPTIONS_DEFINE+=CLI CGI FPM EMBED DEBUG DTRACE IPV6 MAILHEAD LINKTHR ZTS OPTIONS_DEFAULT=CLI CGI FPM IPV6 LINKTHR # Bug 197128: No ASM code for MIPS/MIPS64, disable FPM OPTIONS_EXCLUDE_mips=FPM OPTIONS_EXCLUDE_mips64=FPM OPTIONS_SUB= yes CLI_DESC= Build CLI version CGI_DESC= Build CGI version FPM_DESC= Build FPM version EMBED_DESC= Build embedded library DEBUG_DESC= Enable debug DTRACE_DESC= Enable DTrace support IPV6_DESC= Enable ipv6 support MAILHEAD_DESC= Enable mail header patch LINKTHR_DESC= Link thread lib (for threaded extensions) ZTS_DESC= Force Zend Thread Safety (ZTS) build CONFLICTS= php56-5* php70-* DESTDIRNAME= INSTALL_ROOT .include PATCH_DIST_STRIP= -p1 PATCH_SITES+= LOCAL/ale .if ${PORT_OPTIONS:MMAILHEAD} PATCHFILES+= php-5.5.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(OPTIONS_FILE_SET) && ${OPTIONS_FILE_SET:MAPACHE} IGNORE= doesn't install the Apache module anymore:\ update your OPTIONS and build www/mod_php55 port instead .endif .if defined(PKGNAMEPREFIX) USE_PHP= yes PHP_DEFAULT= 5.5 IGNORE_WITH_PHP=53 54 5 USE_APACHE= 22+ .include "${PORTSDIR}/Mk/bsd.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= libphp5 SHORTMODNAME= php5 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:MCLI} || ${PORT_OPTIONS:MEMBED} PLIST_SUB+= SAPI_INC="" .else PLIST_SUB+= SAPI_INC="@comment " .endif .if !defined(WITH_REGEX_TYPE) || ${WITH_REGEX_TYPE} == "php" CONFIGURE_ARGS+=--with-regex=php .elif defined(WITH_REGEX_TYPE) && ${WITH_REGEX_TYPE} == "system" CONFIGURE_ARGS+=--with-regex=system .endif .if !defined(WITH_ZEND_VM) || ${WITH_ZEND_VM} == "CALL" CONFIGURE_ARGS+=--with-zend-vm=CALL .elif defined(WITH_ZEND_VM) && ${WITH_ZEND_VM} == "SWITCH" CONFIGURE_ARGS+=--with-zend-vm=SWITCH .elif defined(WITH_ZEND_VM) && ${WITH_ZEND_VM} == "GOTO" CONFIGURE_ARGS+=--with-zend-vm=GOTO .endif CONFIGURE_ENV+= ac_cv_pthreads_lib="" \ ac_cv_pthreads_cflags="" \ ac_cv_decimal_fp_supported="no" \ pthreads_working="yes" \ 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 .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 # Work around issues with newer (>=2.64) autoconf pre-configure: @${REINPLACE_CMD} -E 's:^((m4_)?divert)[(]([0-9]*)[)]:\1(600\3):' \ ${WRKSRC}/configure.in `${FIND} ${WRKSRC} -name '*.m4'` @${RM} ${WRKSRC}/configure @${CAT} ${WRKSRC}/acinclude.m4 ${WRKSRC}/build/libtool.m4 > ${WRKSRC}/aclocal.m4 .if !defined(PKGNAMEPREFIX) post-build: @${ECHO_CMD} "PHP_VER=55" > ${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 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/2016Q2/lang/php55/distinfo =================================================================== --- branches/2016Q2/lang/php55/distinfo (revision 415972) +++ branches/2016Q2/lang/php55/distinfo (revision 415973) @@ -1,4 +1,5 @@ -SHA256 (php-5.5.35.tar.bz2) = 2d648dd648e820fd64693ce72f9bf07064d147220e594e39fb9f6310238258d7 -SIZE (php-5.5.35.tar.bz2) = 13690152 -SHA256 (php-5.5.x-mail-header.patch) = b0b5a7c961b2052eb14d9528e76155cbeaa881fb9b4a49f452f9dab07b6fb1c4 -SIZE (php-5.5.x-mail-header.patch) = 3379 +TIMESTAMP = 1464391586 +SHA256 (php-5.5.36.tar.bz2) = 2484edfaa3de606d74f927b55c5206f51b1ae24ea8e428aa9fc15474c7bb71bb +SIZE (php-5.5.36.tar.bz2) = 13686345 +SHA256 (php-5.5.x-mail-header.patch) = f510672c4bf2c228e4d8c7837e16a82169de82139dcf33fafce51e9e55a1b9ed +SIZE (php-5.5.x-mail-header.patch) = 4426 Index: branches/2016Q2/lang/php55/pkg-plist =================================================================== --- branches/2016Q2/lang/php55/pkg-plist (revision 415972) +++ branches/2016Q2/lang/php55/pkg-plist (revision 415973) @@ -1,245 +1,243 @@ %%CLI%%bin/php %%CGI%%bin/php-cgi bin/php-config bin/phpize %%FPM%%sbin/php-fpm etc/php.conf etc/php.ini-development etc/php.ini-production -%%FPM%%@unexec if cmp -s %D/etc/php-fpm.conf %D/etc/php-fpm.conf.default; then rm -f %D/etc/php-fpm.conf; fi -%%FPM%%etc/php-fpm.conf.default -%%FPM%%@exec cp -n %D/%F %B/php-fpm.conf +%%FPM%%@sample etc/php-fpm.conf.default etc/php-fpm.conf include/php/TSRM/TSRM.h include/php/TSRM/readdir.h include/php/TSRM/tsrm_config.h include/php/TSRM/tsrm_config.w32.h include/php/TSRM/tsrm_config_common.h include/php/TSRM/tsrm_nw.h include/php/TSRM/tsrm_strtok_r.h include/php/TSRM/tsrm_virtual_cwd.h include/php/TSRM/tsrm_win32.h include/php/Zend/zend.h include/php/Zend/zend_API.h include/php/Zend/zend_alloc.h include/php/Zend/zend_build.h include/php/Zend/zend_builtin_functions.h include/php/Zend/zend_closures.h include/php/Zend/zend_compile.h include/php/Zend/zend_config.h include/php/Zend/zend_config.nw.h include/php/Zend/zend_config.w32.h include/php/Zend/zend_constants.h include/php/Zend/zend_dtrace.h %%DTRACE%%include/php/Zend/zend_dtrace_gen.h include/php/Zend/zend_dynamic_array.h include/php/Zend/zend_errors.h include/php/Zend/zend_exceptions.h include/php/Zend/zend_execute.h include/php/Zend/zend_extensions.h include/php/Zend/zend_float.h include/php/Zend/zend_gc.h include/php/Zend/zend_generators.h include/php/Zend/zend_globals.h include/php/Zend/zend_globals_macros.h include/php/Zend/zend_hash.h include/php/Zend/zend_highlight.h include/php/Zend/zend_indent.h include/php/Zend/zend_ini.h include/php/Zend/zend_ini_parser.h include/php/Zend/zend_ini_scanner.h include/php/Zend/zend_ini_scanner_defs.h include/php/Zend/zend_interfaces.h include/php/Zend/zend_istdiostream.h include/php/Zend/zend_iterators.h include/php/Zend/zend_language_parser.h include/php/Zend/zend_language_scanner.h include/php/Zend/zend_language_scanner_defs.h include/php/Zend/zend_list.h include/php/Zend/zend_llist.h include/php/Zend/zend_modules.h include/php/Zend/zend_multibyte.h include/php/Zend/zend_multiply.h include/php/Zend/zend_object_handlers.h include/php/Zend/zend_objects.h include/php/Zend/zend_objects_API.h include/php/Zend/zend_operators.h include/php/Zend/zend_ptr_stack.h include/php/Zend/zend_qsort.h include/php/Zend/zend_signal.h include/php/Zend/zend_stack.h include/php/Zend/zend_static_allocator.h include/php/Zend/zend_stream.h include/php/Zend/zend_string.h include/php/Zend/zend_strtod.h include/php/Zend/zend_ts_hash.h include/php/Zend/zend_types.h include/php/Zend/zend_variables.h include/php/Zend/zend_vm.h include/php/Zend/zend_vm_def.h include/php/Zend/zend_vm_execute.h include/php/Zend/zend_vm_opcodes.h include/php/ext/date/lib/timelib.h include/php/ext/date/lib/timelib_config.h include/php/ext/date/lib/timelib_structs.h include/php/ext/date/php_date.h include/php/ext/ereg/php_ereg.h include/php/ext/ereg/php_regex.h include/php/ext/ereg/regex/cclass.h include/php/ext/ereg/regex/cname.h include/php/ext/ereg/regex/regex.h include/php/ext/ereg/regex/regex2.h include/php/ext/ereg/regex/utils.h include/php/ext/libxml/php_libxml.h include/php/ext/mysqlnd/config-win.h include/php/ext/mysqlnd/mysql_float_to_double.h include/php/ext/mysqlnd/mysqlnd.h include/php/ext/mysqlnd/mysqlnd_alloc.h include/php/ext/mysqlnd/mysqlnd_block_alloc.h include/php/ext/mysqlnd/mysqlnd_charset.h include/php/ext/mysqlnd/mysqlnd_debug.h include/php/ext/mysqlnd/mysqlnd_enum_n_def.h include/php/ext/mysqlnd/mysqlnd_ext_plugin.h include/php/ext/mysqlnd/mysqlnd_libmysql_compat.h include/php/ext/mysqlnd/mysqlnd_net.h include/php/ext/mysqlnd/mysqlnd_portability.h include/php/ext/mysqlnd/mysqlnd_priv.h include/php/ext/mysqlnd/mysqlnd_result.h include/php/ext/mysqlnd/mysqlnd_result_meta.h include/php/ext/mysqlnd/mysqlnd_reverse_api.h include/php/ext/mysqlnd/mysqlnd_statistics.h include/php/ext/mysqlnd/mysqlnd_structs.h include/php/ext/mysqlnd/mysqlnd_wireprotocol.h include/php/ext/mysqlnd/php_mysqlnd.h include/php/ext/mysqlnd/php_mysqlnd_config.h include/php/ext/pcre/php_pcre.h include/php/ext/spl/php_spl.h include/php/ext/spl/spl_array.h include/php/ext/spl/spl_directory.h include/php/ext/spl/spl_dllist.h include/php/ext/spl/spl_engine.h include/php/ext/spl/spl_exceptions.h include/php/ext/spl/spl_fixedarray.h include/php/ext/spl/spl_functions.h include/php/ext/spl/spl_heap.h include/php/ext/spl/spl_iterators.h include/php/ext/spl/spl_observer.h include/php/ext/standard/base64.h include/php/ext/standard/basic_functions.h include/php/ext/standard/crc32.h include/php/ext/standard/credits.h include/php/ext/standard/credits_ext.h include/php/ext/standard/credits_sapi.h include/php/ext/standard/crypt_blowfish.h include/php/ext/standard/crypt_freesec.h include/php/ext/standard/css.h include/php/ext/standard/cyr_convert.h include/php/ext/standard/datetime.h include/php/ext/standard/dl.h include/php/ext/standard/exec.h include/php/ext/standard/file.h include/php/ext/standard/flock_compat.h include/php/ext/standard/fsock.h include/php/ext/standard/head.h include/php/ext/standard/html.h include/php/ext/standard/html_tables.h include/php/ext/standard/info.h include/php/ext/standard/md5.h include/php/ext/standard/microtime.h include/php/ext/standard/pack.h include/php/ext/standard/pageinfo.h include/php/ext/standard/php_array.h include/php/ext/standard/php_assert.h include/php/ext/standard/php_browscap.h include/php/ext/standard/php_crypt.h include/php/ext/standard/php_crypt_r.h include/php/ext/standard/php_dir.h include/php/ext/standard/php_dns.h include/php/ext/standard/php_ext_syslog.h include/php/ext/standard/php_filestat.h include/php/ext/standard/php_fopen_wrappers.h include/php/ext/standard/php_ftok.h include/php/ext/standard/php_http.h include/php/ext/standard/php_image.h include/php/ext/standard/php_incomplete_class.h include/php/ext/standard/php_iptc.h include/php/ext/standard/php_lcg.h include/php/ext/standard/php_link.h include/php/ext/standard/php_mail.h include/php/ext/standard/php_math.h include/php/ext/standard/php_metaphone.h include/php/ext/standard/php_password.h include/php/ext/standard/php_rand.h include/php/ext/standard/php_smart_str.h include/php/ext/standard/php_smart_str_public.h include/php/ext/standard/php_standard.h include/php/ext/standard/php_string.h include/php/ext/standard/php_type.h include/php/ext/standard/php_uuencode.h include/php/ext/standard/php_var.h include/php/ext/standard/php_versioning.h include/php/ext/standard/proc_open.h include/php/ext/standard/quot_print.h include/php/ext/standard/scanf.h include/php/ext/standard/sha1.h include/php/ext/standard/streamsfuncs.h include/php/ext/standard/uniqid.h include/php/ext/standard/url.h include/php/ext/standard/url_scanner_ex.h include/php/ext/standard/winver.h @exec touch %D/include/php/ext/php_config.h @unexec [ -s %D/include/php/ext/php_config.h ] || rm %D/include/php/ext/php_config.h include/php/main/SAPI.h include/php/main/build-defs.h include/php/main/fopen_wrappers.h include/php/main/php.h include/php/main/php_compat.h include/php/main/php_config.h include/php/main/php_content_types.h include/php/main/php_getopt.h include/php/main/php_globals.h include/php/main/php_ini.h include/php/main/php_main.h include/php/main/php_memory_streams.h include/php/main/php_network.h include/php/main/php_open_temporary_file.h include/php/main/php_output.h include/php/main/php_reentrancy.h include/php/main/php_scandir.h include/php/main/php_streams.h include/php/main/php_syslog.h include/php/main/php_ticks.h include/php/main/php_variables.h include/php/main/php_version.h include/php/main/rfc1867.h include/php/main/snprintf.h include/php/main/spprintf.h include/php/main/streams/php_stream_context.h include/php/main/streams/php_stream_filter_api.h include/php/main/streams/php_stream_glob_wrapper.h include/php/main/streams/php_stream_mmap.h include/php/main/streams/php_streams_int.h include/php/main/streams/php_stream_transport.h include/php/main/streams/php_stream_userspace.h include/php/main/streams/php_stream_plain_wrapper.h %%CLI%%include/php/sapi/cli/cli.h %%EMBED%%include/php/sapi/embed/php_embed.h include/php/main/win32_internal_function_disabled.h include/php/main/win95nt.h %%EMBED%%lib/libphp5.so lib/php/build/Makefile.global lib/php/build/acinclude.m4 lib/php/build/config.guess lib/php/build/config.sub lib/php/build/libtool.m4 lib/php/build/ltmain.sh lib/php/build/mkdep.awk lib/php/build/phpize.m4 lib/php/build/run-tests.php lib/php/build/scan_makefile_in.awk lib/php/build/shtool %%CGI%%man/man1/php-cgi.1.gz man/man1/php-config.1.gz %%CLI%%man/man1/php.1.gz man/man1/phpize.1.gz %%FPM%%man/man8/php-fpm.8.gz %%FPM%%share/php/fpm/status.html Index: branches/2016Q2/lang/php56/Makefile =================================================================== --- branches/2016Q2/lang/php56/Makefile (revision 415972) +++ branches/2016Q2/lang/php56/Makefile (revision 415973) @@ -1,208 +1,208 @@ # Created by: Alex Dupre # $FreeBSD$ PORTNAME= php56 -PORTVERSION= 5.6.21 +PORTVERSION= 5.6.22 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions DISTNAME= php-${PORTVERSION} MAINTAINER= ale@FreeBSD.org COMMENT= PHP Scripting Language LICENSE= PHP301 USES= tar:bzip2 cpe CPE_PRODUCT= php NO_OPTIONS_SORT=yes .if !defined(PKGNAMESUFFIX) USE_AUTOTOOLS= autoconf LIB_DEPENDS= libpcre.so:devel/pcre CONFIGURE_ARGS+=--with-layout=GNU \ --localstatedir=/var \ --with-config-file-scan-dir=${PREFIX}/etc/php \ --disable-all \ --enable-libxml \ --enable-mysqlnd \ --with-libxml-dir=${LOCALBASE} \ --with-pcre-regex=${LOCALBASE} \ --with-zlib-dir=/usr \ --program-prefix="" USE_GNOME= libxml2 OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 MAILHEAD LINKTHR ZTS OPTIONS_DEFAULT=CLI CGI FPM IPV6 LINKTHR # Bug 197128: No ASM code for MIPS/MIPS64, disable FPM OPTIONS_EXCLUDE_mips=FPM OPTIONS_EXCLUDE_mips64=FPM OPTIONS_SUB= yes CLI_DESC= Build CLI version CGI_DESC= Build CGI version FPM_DESC= Build FPM version EMBED_DESC= Build embedded library DEBUG_DESC= Enable debug DTRACE_DESC= Enable DTrace support IPV6_DESC= Enable ipv6 support MAILHEAD_DESC= Enable mail header patch LINKTHR_DESC= Link thread lib (for threaded extensions) ZTS_DESC= Force Zend Thread Safety (ZTS) build CONFLICTS= php55-5* php70-* DESTDIRNAME= INSTALL_ROOT .include PATCH_DIST_STRIP= -p1 PATCH_SITES+= LOCAL/ale .if ${PORT_OPTIONS:MMAILHEAD} PATCHFILES+= php-5.5.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) USE_PHP= yes PHP_DEFAULT= 5.6 IGNORE_WITH_PHP=53 54 5 USE_APACHE= 22+ .include "${PORTSDIR}/Mk/bsd.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= libphp5 SHORTMODNAME= php5 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 .if !defined(WITH_REGEX_TYPE) || ${WITH_REGEX_TYPE} == "php" CONFIGURE_ARGS+=--with-regex=php .elif defined(WITH_REGEX_TYPE) && ${WITH_REGEX_TYPE} == "system" CONFIGURE_ARGS+=--with-regex=system .endif .if !defined(WITH_ZEND_VM) || ${WITH_ZEND_VM} == "CALL" CONFIGURE_ARGS+=--with-zend-vm=CALL .elif defined(WITH_ZEND_VM) && ${WITH_ZEND_VM} == "SWITCH" CONFIGURE_ARGS+=--with-zend-vm=SWITCH .elif defined(WITH_ZEND_VM) && ${WITH_ZEND_VM} == "GOTO" CONFIGURE_ARGS+=--with-zend-vm=GOTO .endif CONFIGURE_ENV+= ac_cv_pthreads_lib="" \ ac_cv_pthreads_cflags="" \ ac_cv_decimal_fp_supported="no" \ pthreads_working="yes" \ 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 .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 # Work around issues with newer (>=2.64) autoconf pre-configure: @${REINPLACE_CMD} -E 's:^((m4_)?divert)[(]([0-9]*)[)]:\1(600\3):' \ ${WRKSRC}/configure.in `${FIND} ${WRKSRC} -name '*.m4'` @${RM} ${WRKSRC}/configure @${CAT} ${WRKSRC}/acinclude.m4 ${WRKSRC}/build/libtool.m4 > ${WRKSRC}/aclocal.m4 .if !defined(PKGNAMEPREFIX) post-build: @${ECHO_CMD} "PHP_VER=56" > ${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 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/2016Q2/lang/php56/distinfo =================================================================== --- branches/2016Q2/lang/php56/distinfo (revision 415972) +++ branches/2016Q2/lang/php56/distinfo (revision 415973) @@ -1,4 +1,5 @@ -SHA256 (php-5.6.21.tar.bz2) = b4ed7ab574b689fd6d6494fde954826c06efc85c505e017b8d776c7c7f479590 -SIZE (php-5.6.21.tar.bz2) = 14165919 -SHA256 (php-5.5.x-mail-header.patch) = b0b5a7c961b2052eb14d9528e76155cbeaa881fb9b4a49f452f9dab07b6fb1c4 -SIZE (php-5.5.x-mail-header.patch) = 3379 +TIMESTAMP = 1464391783 +SHA256 (php-5.6.22.tar.bz2) = 90da8a80cc52fa699cf2bfa4c6fa737c772df7c92b81ef483460aa3b1e9f88c6 +SIZE (php-5.6.22.tar.bz2) = 14170522 +SHA256 (php-5.5.x-mail-header.patch) = f510672c4bf2c228e4d8c7837e16a82169de82139dcf33fafce51e9e55a1b9ed +SIZE (php-5.5.x-mail-header.patch) = 4426 Index: branches/2016Q2/lang/php56/pkg-plist =================================================================== --- branches/2016Q2/lang/php56/pkg-plist (revision 415972) +++ branches/2016Q2/lang/php56/pkg-plist (revision 415973) @@ -1,248 +1,246 @@ %%CLI%%bin/php %%CGI%%bin/php-cgi bin/php-config %%PHPDBG%%bin/phpdbg bin/phpize %%FPM%%sbin/php-fpm etc/php.conf etc/php.ini-development etc/php.ini-production -%%FPM%%@unexec if cmp -s %D/etc/php-fpm.conf %D/etc/php-fpm.conf.default; then rm -f %D/etc/php-fpm.conf; fi -%%FPM%%etc/php-fpm.conf.default -%%FPM%%@exec cp -n %D/%F %B/php-fpm.conf +%%FPM%%@sample etc/php-fpm.conf.default etc/php-fpm.conf include/php/TSRM/TSRM.h include/php/TSRM/readdir.h include/php/TSRM/tsrm_config.h include/php/TSRM/tsrm_config.w32.h include/php/TSRM/tsrm_config_common.h include/php/TSRM/tsrm_nw.h include/php/TSRM/tsrm_strtok_r.h include/php/TSRM/tsrm_win32.h include/php/Zend/zend.h include/php/Zend/zend_API.h include/php/Zend/zend_alloc.h include/php/Zend/zend_ast.h include/php/Zend/zend_build.h include/php/Zend/zend_builtin_functions.h include/php/Zend/zend_closures.h include/php/Zend/zend_compile.h include/php/Zend/zend_config.h include/php/Zend/zend_config.nw.h include/php/Zend/zend_config.w32.h include/php/Zend/zend_constants.h include/php/Zend/zend_dtrace.h %%DTRACE%%include/php/Zend/zend_dtrace_gen.h include/php/Zend/zend_dynamic_array.h include/php/Zend/zend_errors.h include/php/Zend/zend_exceptions.h include/php/Zend/zend_execute.h include/php/Zend/zend_extensions.h include/php/Zend/zend_float.h include/php/Zend/zend_gc.h include/php/Zend/zend_generators.h include/php/Zend/zend_globals.h include/php/Zend/zend_globals_macros.h include/php/Zend/zend_hash.h include/php/Zend/zend_highlight.h include/php/Zend/zend_indent.h include/php/Zend/zend_ini.h include/php/Zend/zend_ini_parser.h include/php/Zend/zend_ini_scanner.h include/php/Zend/zend_ini_scanner_defs.h include/php/Zend/zend_interfaces.h include/php/Zend/zend_istdiostream.h include/php/Zend/zend_iterators.h include/php/Zend/zend_language_parser.h include/php/Zend/zend_language_scanner.h include/php/Zend/zend_language_scanner_defs.h include/php/Zend/zend_list.h include/php/Zend/zend_llist.h include/php/Zend/zend_modules.h include/php/Zend/zend_multibyte.h include/php/Zend/zend_multiply.h include/php/Zend/zend_object_handlers.h include/php/Zend/zend_objects.h include/php/Zend/zend_objects_API.h include/php/Zend/zend_operators.h include/php/Zend/zend_ptr_stack.h include/php/Zend/zend_qsort.h include/php/Zend/zend_signal.h include/php/Zend/zend_stack.h include/php/Zend/zend_static_allocator.h include/php/Zend/zend_stream.h include/php/Zend/zend_string.h include/php/Zend/zend_strtod.h include/php/Zend/zend_ts_hash.h include/php/Zend/zend_types.h include/php/Zend/zend_variables.h include/php/Zend/zend_virtual_cwd.h include/php/Zend/zend_vm.h include/php/Zend/zend_vm_def.h include/php/Zend/zend_vm_execute.h include/php/Zend/zend_vm_opcodes.h include/php/ext/date/lib/timelib.h include/php/ext/date/lib/timelib_config.h include/php/ext/date/lib/timelib_structs.h include/php/ext/date/php_date.h include/php/ext/ereg/php_ereg.h include/php/ext/ereg/php_regex.h include/php/ext/ereg/regex/cclass.h include/php/ext/ereg/regex/cname.h include/php/ext/ereg/regex/regex.h include/php/ext/ereg/regex/regex2.h include/php/ext/ereg/regex/utils.h include/php/ext/libxml/php_libxml.h include/php/ext/mysqlnd/config-win.h include/php/ext/mysqlnd/mysql_float_to_double.h include/php/ext/mysqlnd/mysqlnd.h include/php/ext/mysqlnd/mysqlnd_alloc.h include/php/ext/mysqlnd/mysqlnd_block_alloc.h include/php/ext/mysqlnd/mysqlnd_charset.h include/php/ext/mysqlnd/mysqlnd_debug.h include/php/ext/mysqlnd/mysqlnd_enum_n_def.h include/php/ext/mysqlnd/mysqlnd_ext_plugin.h include/php/ext/mysqlnd/mysqlnd_libmysql_compat.h include/php/ext/mysqlnd/mysqlnd_net.h include/php/ext/mysqlnd/mysqlnd_portability.h include/php/ext/mysqlnd/mysqlnd_priv.h include/php/ext/mysqlnd/mysqlnd_result.h include/php/ext/mysqlnd/mysqlnd_result_meta.h include/php/ext/mysqlnd/mysqlnd_reverse_api.h include/php/ext/mysqlnd/mysqlnd_statistics.h include/php/ext/mysqlnd/mysqlnd_structs.h include/php/ext/mysqlnd/mysqlnd_wireprotocol.h include/php/ext/mysqlnd/php_mysqlnd.h include/php/ext/pcre/php_pcre.h include/php/ext/spl/php_spl.h include/php/ext/spl/spl_array.h include/php/ext/spl/spl_directory.h include/php/ext/spl/spl_dllist.h include/php/ext/spl/spl_engine.h include/php/ext/spl/spl_exceptions.h include/php/ext/spl/spl_fixedarray.h include/php/ext/spl/spl_functions.h include/php/ext/spl/spl_heap.h include/php/ext/spl/spl_iterators.h include/php/ext/spl/spl_observer.h include/php/ext/standard/base64.h include/php/ext/standard/basic_functions.h include/php/ext/standard/crc32.h include/php/ext/standard/credits.h include/php/ext/standard/credits_ext.h include/php/ext/standard/credits_sapi.h include/php/ext/standard/crypt_blowfish.h include/php/ext/standard/crypt_freesec.h include/php/ext/standard/css.h include/php/ext/standard/cyr_convert.h include/php/ext/standard/datetime.h include/php/ext/standard/dl.h include/php/ext/standard/exec.h include/php/ext/standard/file.h include/php/ext/standard/flock_compat.h include/php/ext/standard/fsock.h include/php/ext/standard/head.h include/php/ext/standard/html.h include/php/ext/standard/html_tables.h include/php/ext/standard/info.h include/php/ext/standard/md5.h include/php/ext/standard/microtime.h include/php/ext/standard/pack.h include/php/ext/standard/pageinfo.h include/php/ext/standard/php_array.h include/php/ext/standard/php_assert.h include/php/ext/standard/php_browscap.h include/php/ext/standard/php_crypt.h include/php/ext/standard/php_crypt_r.h include/php/ext/standard/php_dir.h include/php/ext/standard/php_dns.h include/php/ext/standard/php_ext_syslog.h include/php/ext/standard/php_filestat.h include/php/ext/standard/php_fopen_wrappers.h include/php/ext/standard/php_ftok.h include/php/ext/standard/php_http.h include/php/ext/standard/php_image.h include/php/ext/standard/php_incomplete_class.h include/php/ext/standard/php_iptc.h include/php/ext/standard/php_lcg.h include/php/ext/standard/php_link.h include/php/ext/standard/php_mail.h include/php/ext/standard/php_math.h include/php/ext/standard/php_metaphone.h include/php/ext/standard/php_password.h include/php/ext/standard/php_rand.h include/php/ext/standard/php_smart_str.h include/php/ext/standard/php_smart_str_public.h include/php/ext/standard/php_standard.h include/php/ext/standard/php_string.h include/php/ext/standard/php_type.h include/php/ext/standard/php_uuencode.h include/php/ext/standard/php_var.h include/php/ext/standard/php_versioning.h include/php/ext/standard/proc_open.h include/php/ext/standard/quot_print.h include/php/ext/standard/scanf.h include/php/ext/standard/sha1.h include/php/ext/standard/streamsfuncs.h include/php/ext/standard/uniqid.h include/php/ext/standard/url.h include/php/ext/standard/url_scanner_ex.h include/php/ext/standard/winver.h @exec touch %D/include/php/ext/php_config.h @unexec [ -s %D/include/php/ext/php_config.h ] || rm %D/include/php/ext/php_config.h include/php/main/SAPI.h include/php/main/build-defs.h include/php/main/fopen_wrappers.h include/php/main/php.h include/php/main/php_compat.h include/php/main/php_config.h include/php/main/php_content_types.h include/php/main/php_getopt.h include/php/main/php_globals.h include/php/main/php_ini.h include/php/main/php_main.h include/php/main/php_memory_streams.h include/php/main/php_network.h include/php/main/php_open_temporary_file.h include/php/main/php_output.h include/php/main/php_reentrancy.h include/php/main/php_scandir.h include/php/main/php_stdint.h include/php/main/php_streams.h include/php/main/php_syslog.h include/php/main/php_ticks.h include/php/main/php_variables.h include/php/main/php_version.h include/php/main/rfc1867.h include/php/main/snprintf.h include/php/main/spprintf.h include/php/main/streams/php_stream_context.h include/php/main/streams/php_stream_filter_api.h include/php/main/streams/php_stream_glob_wrapper.h include/php/main/streams/php_stream_mmap.h include/php/main/streams/php_streams_int.h include/php/main/streams/php_stream_transport.h include/php/main/streams/php_stream_userspace.h include/php/main/streams/php_stream_plain_wrapper.h %%CLI%%include/php/sapi/cli/cli.h %%EMBED%%include/php/sapi/embed/php_embed.h include/php/main/win32_internal_function_disabled.h include/php/main/win95nt.h %%EMBED%%lib/libphp5.so lib/php/build/Makefile.global lib/php/build/acinclude.m4 lib/php/build/config.guess lib/php/build/config.sub lib/php/build/libtool.m4 lib/php/build/ltmain.sh lib/php/build/mkdep.awk lib/php/build/phpize.m4 lib/php/build/run-tests.php lib/php/build/scan_makefile_in.awk lib/php/build/shtool %%CGI%%man/man1/php-cgi.1.gz man/man1/php-config.1.gz %%CLI%%man/man1/php.1.gz %%PHPDBG%%man/man1/phpdbg.1.gz man/man1/phpize.1.gz %%FPM%%man/man8/php-fpm.8.gz %%FPM%%share/php/fpm/status.html Index: branches/2016Q2/lang/php70/Makefile =================================================================== --- branches/2016Q2/lang/php70/Makefile (revision 415972) +++ branches/2016Q2/lang/php70/Makefile (revision 415973) @@ -1,199 +1,200 @@ # Created by: Alex Dupre # $FreeBSD$ PORTNAME= php70 -PORTVERSION= 7.0.6 +PORTVERSION= 7.0.7 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions DISTNAME= php-${PORTVERSION} MAINTAINER= miwi@FreeBSD.org COMMENT= PHP Scripting Language LICENSE= PHP301 USES= tar:bzip2 cpe CPE_PRODUCT= php NO_OPTIONS_SORT=yes .if !defined(PKGNAMESUFFIX) USE_AUTOTOOLS= autoconf #NOTE: libtools ends with Version mismatch error #USES+= autoreconf gmake #GNU_CONFIGURE= yes LIB_DEPENDS= libpcre.so:devel/pcre CONFIGURE_ARGS+=--with-layout=GNU \ --localstatedir=/var \ --with-config-file-scan-dir=${PREFIX}/etc/php \ --disable-all \ --enable-libxml \ --enable-mysqlnd \ --with-libxml-dir=${LOCALBASE} \ --with-pcre-regex=${LOCALBASE} \ --program-prefix="" USE_GNOME= libxml2 OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 LINKTHR ZTS OPTIONS_DEFAULT=CLI CGI FPM IPV6 LINKTHR # Bug 197128: No ASM code for MIPS/MIPS64, disable FPM OPTIONS_EXCLUDE_mips=FPM OPTIONS_EXCLUDE_mips64=FPM OPTIONS_SUB= yes CLI_DESC= Build CLI version CGI_DESC= Build CGI version FPM_DESC= Build FPM version EMBED_DESC= Build embedded library DEBUG_DESC= Enable debug PHPDBG_DESC= Interactive PHP debugger DTRACE_DESC= Enable DTrace support IPV6_DESC= Enable ipv6 support LINKTHR_DESC= Link thread lib (for threaded extensions) ZTS_DESC= Force Zend Thread Safety (ZTS) build CONFLICTS= php55-5* php56-* DESTDIRNAME= INSTALL_ROOT .include .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) USE_PHP= yes PHP_DEFAULT= 7.0 IGNORE_WITH_PHP= 55 56 USE_APACHE= 22+ .include "${PORTSDIR}/Mk/bsd.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 .if !defined(WITH_REGEX_TYPE) || ${WITH_REGEX_TYPE} == "php" CONFIGURE_ARGS+=--with-regex=php .elif defined(WITH_REGEX_TYPE) && ${WITH_REGEX_TYPE} == "system" CONFIGURE_ARGS+=--with-regex=system .endif .if !defined(WITH_ZEND_VM) || ${WITH_ZEND_VM} == "CALL" CONFIGURE_ARGS+=--with-zend-vm=CALL .elif defined(WITH_ZEND_VM) && ${WITH_ZEND_VM} == "SWITCH" CONFIGURE_ARGS+=--with-zend-vm=SWITCH .elif defined(WITH_ZEND_VM) && ${WITH_ZEND_VM} == "GOTO" CONFIGURE_ARGS+=--with-zend-vm=GOTO .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" USES= localhost .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: @${REINPLACE_CMD} -E 's:^((m4_)?divert)[(]([0-9]*)[)]:\1(600\3):' \ ${WRKSRC}/configure.in `${FIND} ${WRKSRC} -name '*.m4'` @${RM} ${WRKSRC}/configure @${CAT} ${WRKSRC}/acinclude.m4 ${WRKSRC}/build/libtool.m4 > ${WRKSRC}/aclocal.m4 .if !defined(PKGNAMEPREFIX) post-build: @${ECHO_CMD} "PHP_VER=70" > ${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 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/2016Q2/lang/php70/distinfo =================================================================== --- branches/2016Q2/lang/php70/distinfo (revision 415972) +++ branches/2016Q2/lang/php70/distinfo (revision 415973) @@ -1,2 +1,3 @@ -SHA256 (php-7.0.6.tar.bz2) = 14ddf192a9965c858c1e742a61456be2f34a4db87556172c0d76f08de96329b7 -SIZE (php-7.0.6.tar.bz2) = 14102594 +TIMESTAMP = 1464392035 +SHA256 (php-7.0.7.tar.bz2) = 474f2925c4782b94016e3afbb17b14ff9cc6f4fdb6f6e231b36a378bb18a3d1a +SIZE (php-7.0.7.tar.bz2) = 14106181 Index: branches/2016Q2/lang/php70/pkg-plist =================================================================== --- branches/2016Q2/lang/php70/pkg-plist (revision 415972) +++ branches/2016Q2/lang/php70/pkg-plist (revision 415973) @@ -1,253 +1,249 @@ %%CLI%%bin/php %%CGI%%bin/php-cgi bin/php-config %%PHPDBG%%bin/phpdbg bin/phpize %%FPM%%sbin/php-fpm etc/php.conf etc/php.ini-development etc/php.ini-production -%%FPM%%@unexec if cmp -s %D/etc/php-fpm.conf %D/etc/php-fpm.conf.default; then rm -f %D/etc/php-fpm.conf; fi -%%FPM%%etc/php-fpm.conf.default -%%FPM%%@exec cp -n %D/%F %B/php-fpm.conf -%%FPM%%@unexec if cmp -s %D/etc/php-fpm.d/www.conf %D/etc/php-fpm.d/www.conf.default; then rm -f %D/etc/php-fpm.d/www.conf; fi -%%FPM%%etc/php-fpm.d/www.conf.default -%%FPM%%@exec cp -n %D/%F %B/www.conf +%%FPM%%@sample etc/php-fpm.conf.default etc/php-fpm.conf +%%FPM%%@sample etc/php-fpm.d/www.conf.default etc/php-fpm.d/www.conf include/php/TSRM/TSRM.h include/php/TSRM/readdir.h include/php/TSRM/tsrm_config.h include/php/TSRM/tsrm_config.w32.h include/php/TSRM/tsrm_config_common.h include/php/TSRM/tsrm_nw.h include/php/TSRM/tsrm_strtok_r.h include/php/TSRM/tsrm_win32.h include/php/Zend/zend.h include/php/Zend/zend_API.h include/php/Zend/zend_alloc.h include/php/Zend/zend_alloc_sizes.h include/php/Zend/zend_arena.h include/php/Zend/zend_ast.h include/php/Zend/zend_bitset.h include/php/Zend/zend_build.h include/php/Zend/zend_builtin_functions.h include/php/Zend/zend_closures.h include/php/Zend/zend_compile.h include/php/Zend/zend_config.h include/php/Zend/zend_config.nw.h include/php/Zend/zend_config.w32.h include/php/Zend/zend_constants.h include/php/Zend/zend_dtrace.h %%DTRACE%%include/php/Zend/zend_dtrace_gen.h include/php/Zend/zend_errors.h include/php/Zend/zend_exceptions.h include/php/Zend/zend_execute.h include/php/Zend/zend_extensions.h include/php/Zend/zend_float.h include/php/Zend/zend_gc.h include/php/Zend/zend_generators.h include/php/Zend/zend_globals.h include/php/Zend/zend_globals_macros.h include/php/Zend/zend_hash.h include/php/Zend/zend_highlight.h include/php/Zend/zend_inheritance.h include/php/Zend/zend_ini.h include/php/Zend/zend_ini_parser.h include/php/Zend/zend_ini_scanner.h include/php/Zend/zend_ini_scanner_defs.h include/php/Zend/zend_interfaces.h include/php/Zend/zend_istdiostream.h include/php/Zend/zend_iterators.h include/php/Zend/zend_language_parser.h include/php/Zend/zend_language_scanner.h include/php/Zend/zend_language_scanner_defs.h include/php/Zend/zend_list.h include/php/Zend/zend_llist.h include/php/Zend/zend_long.h include/php/Zend/zend_modules.h include/php/Zend/zend_multibyte.h include/php/Zend/zend_multiply.h include/php/Zend/zend_object_handlers.h include/php/Zend/zend_objects.h include/php/Zend/zend_objects_API.h include/php/Zend/zend_operators.h include/php/Zend/zend_portability.h include/php/Zend/zend_ptr_stack.h include/php/Zend/zend_range_check.h include/php/Zend/zend_signal.h include/php/Zend/zend_smart_str.h include/php/Zend/zend_smart_str_public.h include/php/Zend/zend_sort.h include/php/Zend/zend_stack.h include/php/Zend/zend_stream.h include/php/Zend/zend_string.h include/php/Zend/zend_strtod.h include/php/Zend/zend_strtod_int.h include/php/Zend/zend_ts_hash.h include/php/Zend/zend_types.h include/php/Zend/zend_variables.h include/php/Zend/zend_virtual_cwd.h include/php/Zend/zend_vm.h include/php/Zend/zend_vm_def.h include/php/Zend/zend_vm_execute.h include/php/Zend/zend_vm_opcodes.h include/php/ext/date/lib/timelib.h include/php/ext/date/lib/timelib_config.h include/php/ext/date/lib/timelib_structs.h include/php/ext/date/php_date.h include/php/ext/libxml/php_libxml.h include/php/ext/mysqlnd/config-win.h include/php/ext/mysqlnd/mysql_float_to_double.h include/php/ext/mysqlnd/mysqlnd.h include/php/ext/mysqlnd/mysqlnd_alloc.h include/php/ext/mysqlnd/mysqlnd_block_alloc.h include/php/ext/mysqlnd/mysqlnd_charset.h include/php/ext/mysqlnd/mysqlnd_debug.h include/php/ext/mysqlnd/mysqlnd_enum_n_def.h include/php/ext/mysqlnd/mysqlnd_ext_plugin.h include/php/ext/mysqlnd/mysqlnd_libmysql_compat.h include/php/ext/mysqlnd/mysqlnd_net.h include/php/ext/mysqlnd/mysqlnd_portability.h include/php/ext/mysqlnd/mysqlnd_priv.h include/php/ext/mysqlnd/mysqlnd_result.h include/php/ext/mysqlnd/mysqlnd_result_meta.h include/php/ext/mysqlnd/mysqlnd_reverse_api.h include/php/ext/mysqlnd/mysqlnd_statistics.h include/php/ext/mysqlnd/mysqlnd_structs.h include/php/ext/mysqlnd/mysqlnd_wireprotocol.h include/php/ext/mysqlnd/php_mysqlnd.h include/php/ext/pcre/php_pcre.h include/php/ext/spl/php_spl.h include/php/ext/spl/spl_array.h include/php/ext/spl/spl_directory.h include/php/ext/spl/spl_dllist.h include/php/ext/spl/spl_engine.h include/php/ext/spl/spl_exceptions.h include/php/ext/spl/spl_fixedarray.h include/php/ext/spl/spl_functions.h include/php/ext/spl/spl_heap.h include/php/ext/spl/spl_iterators.h include/php/ext/spl/spl_observer.h include/php/ext/standard/base64.h include/php/ext/standard/basic_functions.h include/php/ext/standard/crc32.h include/php/ext/standard/credits.h include/php/ext/standard/credits_ext.h include/php/ext/standard/credits_sapi.h include/php/ext/standard/crypt_blowfish.h include/php/ext/standard/crypt_freesec.h include/php/ext/standard/css.h include/php/ext/standard/cyr_convert.h include/php/ext/standard/datetime.h include/php/ext/standard/dl.h include/php/ext/standard/exec.h include/php/ext/standard/file.h include/php/ext/standard/flock_compat.h include/php/ext/standard/fsock.h include/php/ext/standard/head.h include/php/ext/standard/html.h include/php/ext/standard/html_tables.h include/php/ext/standard/info.h include/php/ext/standard/md5.h include/php/ext/standard/microtime.h include/php/ext/standard/pack.h include/php/ext/standard/pageinfo.h include/php/ext/standard/php_array.h include/php/ext/standard/php_assert.h include/php/ext/standard/php_browscap.h include/php/ext/standard/php_crypt.h include/php/ext/standard/php_crypt_r.h include/php/ext/standard/php_dir.h include/php/ext/standard/php_dns.h include/php/ext/standard/php_ext_syslog.h include/php/ext/standard/php_filestat.h include/php/ext/standard/php_fopen_wrappers.h include/php/ext/standard/php_ftok.h include/php/ext/standard/php_http.h include/php/ext/standard/php_image.h include/php/ext/standard/php_incomplete_class.h include/php/ext/standard/php_iptc.h include/php/ext/standard/php_lcg.h include/php/ext/standard/php_link.h include/php/ext/standard/php_mail.h include/php/ext/standard/php_math.h include/php/ext/standard/php_metaphone.h include/php/ext/standard/php_password.h include/php/ext/standard/php_rand.h include/php/ext/standard/php_random.h include/php/ext/standard/php_smart_string.h include/php/ext/standard/php_smart_string_public.h include/php/ext/standard/php_standard.h include/php/ext/standard/php_string.h include/php/ext/standard/php_type.h include/php/ext/standard/php_uuencode.h include/php/ext/standard/php_var.h include/php/ext/standard/php_versioning.h include/php/ext/standard/proc_open.h include/php/ext/standard/quot_print.h include/php/ext/standard/scanf.h include/php/ext/standard/sha1.h include/php/ext/standard/streamsfuncs.h include/php/ext/standard/uniqid.h include/php/ext/standard/url.h include/php/ext/standard/url_scanner_ex.h include/php/ext/standard/winver.h @exec touch %D/include/php/ext/php_config.h @unexec [ -s %D/include/php/ext/php_config.h ] || rm %D/include/php/ext/php_config.h include/php/main/SAPI.h include/php/main/build-defs.h include/php/main/fastcgi.h include/php/main/fopen_wrappers.h include/php/main/http_status_codes.h include/php/main/php.h include/php/main/php_compat.h include/php/main/php_config.h include/php/main/php_content_types.h include/php/main/php_getopt.h include/php/main/php_globals.h include/php/main/php_ini.h include/php/main/php_main.h include/php/main/php_memory_streams.h include/php/main/php_network.h include/php/main/php_open_temporary_file.h include/php/main/php_output.h include/php/main/php_reentrancy.h include/php/main/php_scandir.h include/php/main/php_stdint.h include/php/main/php_streams.h include/php/main/php_syslog.h include/php/main/php_ticks.h include/php/main/php_variables.h include/php/main/php_version.h include/php/main/rfc1867.h include/php/main/snprintf.h include/php/main/spprintf.h include/php/main/streams/php_stream_context.h include/php/main/streams/php_stream_filter_api.h include/php/main/streams/php_stream_glob_wrapper.h include/php/main/streams/php_stream_mmap.h include/php/main/streams/php_stream_plain_wrapper.h include/php/main/streams/php_stream_transport.h include/php/main/streams/php_stream_userspace.h include/php/main/streams/php_streams_int.h %%CLI%%include/php/sapi/cli/cli.h %%EMBED%%include/php/sapi/embed/php_embed.h include/php/main/win95nt.h %%EMBED%%lib/libphp7.so lib/php/build/Makefile.global lib/php/build/acinclude.m4 lib/php/build/config.guess lib/php/build/config.sub lib/php/build/libtool.m4 lib/php/build/ltmain.sh lib/php/build/mkdep.awk lib/php/build/phpize.m4 lib/php/build/run-tests.php lib/php/build/scan_makefile_in.awk lib/php/build/shtool %%CGI%%man/man1/php-cgi.1.gz man/man1/php-config.1.gz %%CLI%%man/man1/php.1.gz %%PHPDBG%%man/man1/phpdbg.1.gz man/man1/phpize.1.gz %%FPM%%man/man8/php-fpm.8.gz %%FPM%%share/php/fpm/status.html Index: branches/2016Q2 =================================================================== --- branches/2016Q2 (revision 415972) +++ branches/2016Q2 (revision 415973) Property changes on: branches/2016Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r415304,415818,415970-415972