Index: branches/2019Q1/databases/php73-pdo_pgsql/Makefile =================================================================== --- branches/2019Q1/databases/php73-pdo_pgsql/Makefile (revision 490245) +++ branches/2019Q1/databases/php73-pdo_pgsql/Makefile (revision 490246) @@ -1,12 +1,11 @@ # $FreeBSD$ -PORTREVISION= 1 CATEGORIES= databases MASTERDIR= ${.CURDIR}/../../lang/php73 PKGNAMESUFFIX= -pdo_pgsql TEST_TARGET= test .include "${MASTERDIR}/Makefile" Index: branches/2019Q1/databases/php73-pgsql/Makefile =================================================================== --- branches/2019Q1/databases/php73-pgsql/Makefile (revision 490245) +++ branches/2019Q1/databases/php73-pgsql/Makefile (revision 490246) @@ -1,12 +1,11 @@ # $FreeBSD$ -PORTREVISION= 1 CATEGORIES= databases MASTERDIR= ${.CURDIR}/../../lang/php73 PKGNAMESUFFIX= -pgsql TEST_TARGET= test .include "${MASTERDIR}/Makefile" Index: branches/2019Q1/devel/php73-intl/Makefile =================================================================== --- branches/2019Q1/devel/php73-intl/Makefile (revision 490245) +++ branches/2019Q1/devel/php73-intl/Makefile (revision 490246) @@ -1,17 +1,16 @@ # $FreeBSD$ -PORTREVISION= 1 CATEGORIES= devel MASTERDIR= ${.CURDIR}/../../lang/php73 PKGNAMESUFFIX= -intl USES= compiler:c++11-lib USE_CXXSTD= gnu++11 CPPFLAGS+= -DU_USING_ICU_NAMESPACE=1 TEST_TARGET= test .include "${MASTERDIR}/Makefile" Index: branches/2019Q1/lang/php73/Makefile =================================================================== --- branches/2019Q1/lang/php73/Makefile (revision 490245) +++ branches/2019Q1/lang/php73/Makefile (revision 490246) @@ -1,184 +1,184 @@ # $FreeBSD$ PORTNAME= php73 -DISTVERSION= 7.3.0 -PORTREVISION?= 1 +DISTVERSION= 7.3.1 +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 # 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 490245) +++ branches/2019Q1/lang/php73/distinfo (revision 490246) @@ -1,3 +1,3 @@ -TIMESTAMP = 1544005190 -SHA256 (php-7.3.0.tar.xz) = 7d195cad55af8b288c3919c67023a14ff870a73e3acc2165a6d17a4850a560b5 -SIZE (php-7.3.0.tar.xz) = 11928820 +TIMESTAMP = 1547458364 +SHA256 (php-7.3.1.tar.xz) = cfe93e40be0350cd53c4a579f52fe5d8faf9c6db047f650a4566a2276bf33362 +SIZE (php-7.3.1.tar.xz) = 11944376 Index: branches/2019Q1/lang/php73/files/patch-configure.ac =================================================================== --- branches/2019Q1/lang/php73/files/patch-configure.ac (revision 490245) +++ branches/2019Q1/lang/php73/files/patch-configure.ac (nonexistent) @@ -1,14 +0,0 @@ ---- configure.ac.orig 2019-01-08 12:14:44 UTC -+++ configure.ac -@@ -579,7 +579,10 @@ PHP_SOCKADDR_CHECKS - - dnl Checks for GCC function attributes on all systems except ones without glibc - dnl Fix for these systems is already included in GCC 7, but not on GCC 6 --AS_CASE([$host_alias], [*-*-*android*|*-*-*uclibc*|*-*-*musl*], [true], [ -+dnl -+dnl At least some versions of FreeBSD seem to have buggy ifunc support, see -+dnl bug #77284. Conservatively don't use ifuncs on FreeBSD. -+AS_CASE([$host_alias], [*-*-*android*|*-*-*uclibc*|*-*-*musl*|*freebsd*], [true], [ - AX_GCC_FUNC_ATTRIBUTE([ifunc]) - AX_GCC_FUNC_ATTRIBUTE([target]) - ]) Property changes on: branches/2019Q1/lang/php73/files/patch-configure.ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2019Q1 =================================================================== --- branches/2019Q1 (revision 490245) +++ branches/2019Q1 (revision 490246) Property changes on: branches/2019Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r490239