Index: branches/2019Q1/devel/php73-readline/files/patch-config.m4 =================================================================== --- branches/2019Q1/devel/php73-readline/files/patch-config.m4 (revision 492425) +++ branches/2019Q1/devel/php73-readline/files/patch-config.m4 (revision 492426) @@ -1,38 +1,30 @@ ---- config.m4.orig 2013-08-20 06:46:43.000000000 +0200 -+++ config.m4 2013-08-27 16:01:29.000000000 +0200 -@@ -5,13 +5,8 @@ - PHP_ARG_WITH(libedit,for libedit readline replacement, +--- config.m4.orig 2019-02-05 13:10:04 UTC ++++ config.m4 +@@ -3,13 +3,8 @@ dnl config.m4 for extension readline + PHP_ARG_WITH(libedit,for libedit readline replacement, [ --with-libedit[=DIR] Include libedit readline replacement (CLI/CGI only)]) -if test "$PHP_LIBEDIT" = "no"; then PHP_ARG_WITH(readline,for readline support, [ --with-readline[=DIR] Include readline support (CLI/CGI only)]) -else - dnl "register" the --with-readline option to preven invalid "unknown configure option" warning - php_with_readline=no -fi if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then for i in $PHP_READLINE /usr/local /usr; do -@@ -67,6 +62,13 @@ +@@ -72,6 +67,13 @@ if test "$PHP_READLINE" && test "$PHP_RE -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS ]) + PHP_CHECK_LIBRARY(readline, rl_completion_matches, + [ + AC_DEFINE(HAVE_RL_COMPLETION_MATCHES, 1, [ ]) + ],[],[ + -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS + ]) + AC_DEFINE(HAVE_LIBREADLINE, 1, [ ]) elif test "$PHP_LIBEDIT" != "no"; then -@@ -118,7 +120,6 @@ - fi - - if test "$PHP_READLINE" != "no" || test "$PHP_LIBEDIT" != "no"; then -- AC_CHECK_FUNCS([rl_completion_matches]) - PHP_NEW_EXTENSION(readline, readline.c readline_cli.c, $ext_shared, cli) - PHP_SUBST(READLINE_SHARED_LIBADD) - fi Index: branches/2019Q1/lang/php73/Makefile =================================================================== --- branches/2019Q1/lang/php73/Makefile (revision 492425) +++ branches/2019Q1/lang/php73/Makefile (revision 492426) @@ -1,185 +1,185 @@ # $FreeBSD$ PORTNAME= php73 -DISTVERSION= 7.3.1 +DISTVERSION= 7.3.2 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions DISTNAME= php-${DISTVERSION} MAINTAINER= tz@FreeBSD.org COMMENT= PHP Scripting Language LICENSE= PHP301 USES+= tar:xz cpe gnome CPE_PRODUCT= php NO_OPTIONS_SORT=yes .if !defined(PKGNAMESUFFIX) LIB_DEPENDS= libpcre2-8.so:devel/pcre2 \ libargon2.so:security/libargon2 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} \ --with-password-argon2=${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 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 OPTIONS_EXCLUDE_powerpc= 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 LINKTHR_DESC= Link thread lib (for threaded extensions) ZTS_DESC= Force Zend Thread Safety (ZTS) build CONFLICTS= php56-* php70-* php71-* php72-* 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) 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=73" > ${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/2019Q1/lang/php73/distinfo =================================================================== --- branches/2019Q1/lang/php73/distinfo (revision 492425) +++ branches/2019Q1/lang/php73/distinfo (revision 492426) @@ -1,3 +1,3 @@ -TIMESTAMP = 1547458364 -SHA256 (php-7.3.1.tar.xz) = cfe93e40be0350cd53c4a579f52fe5d8faf9c6db047f650a4566a2276bf33362 -SIZE (php-7.3.1.tar.xz) = 11944376 +TIMESTAMP = 1549614925 +SHA256 (php-7.3.2.tar.xz) = 010b868b4456644ae227d05ad236c8b0a1f57dc6320e7e5ad75e86c5baf0a9a8 +SIZE (php-7.3.2.tar.xz) = 11966760 Index: branches/2019Q1 =================================================================== --- branches/2019Q1 (revision 492425) +++ branches/2019Q1 (revision 492426) Property changes on: branches/2019Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r492425