Index: head/devel/php80-intl/files/patch-icu68 =================================================================== --- head/devel/php80-intl/files/patch-icu68 (revision 556078) +++ head/devel/php80-intl/files/patch-icu68 (nonexistent) @@ -1,222 +0,0 @@ -Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 - -ext/intl/breakiterator/codepointiterator_internal.cpp:60:53: error: use of undeclared identifier 'FALSE' - this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec); - ^ -ext/intl/breakiterator/codepointiterator_internal.cpp:60:60: error: use of undeclared identifier 'TRUE' - this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec); - ^ -ext/intl/breakiterator/codepointiterator_internal.cpp:80:10: error: use of undeclared identifier 'FALSE' - return FALSE; - ^ -ext/intl/breakiterator/codepointiterator_internal.cpp:87:10: error: use of undeclared identifier 'FALSE' - return FALSE; - ^ -ext/intl/breakiterator/codepointiterator_internal.cpp:90:9: error: use of undeclared identifier 'TRUE' - return TRUE; - ^ -ext/intl/breakiterator/codepointiterator_internal.cpp:111:42: error: use of undeclared identifier 'FALSE' - return utext_clone(fillIn, this->fText, FALSE, TRUE, &status); - ^ -ext/intl/breakiterator/codepointiterator_internal.cpp:111:49: error: use of undeclared identifier 'TRUE' - return utext_clone(fillIn, this->fText, FALSE, TRUE, &status); - ^ -ext/intl/breakiterator/codepointiterator_internal.cpp:130:47: error: use of undeclared identifier 'FALSE' - this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status); - ^ -ext/intl/breakiterator/codepointiterator_internal.cpp:130:54: error: use of undeclared identifier 'TRUE' - this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status); - ^ -ext/intl/breakiterator/codepointiterator_internal.cpp:282:48: error: use of undeclared identifier 'FALSE' - this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status); - ^ -ext/intl/breakiterator/codepointiterator_internal.cpp:282:55: error: use of undeclared identifier 'TRUE' - this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status); - ^ -ext/intl/collator/collator_sort.c:349:26: error: use of undeclared identifier 'TRUE' - collator_sort_internal( TRUE, INTERNAL_FUNCTION_PARAM_PASSTHRU ); - ^ -ext/intl/collator/collator_sort.c:543:26: error: use of undeclared identifier 'FALSE' - collator_sort_internal( FALSE, INTERNAL_FUNCTION_PARAM_PASSTHRU ); - ^ -ext/intl/dateformat/dateformat_attr.c:91:36: error: use of undeclared identifier 'FALSE' - zend_bool is_pattern_localized =FALSE; - ^ -ext/intl/dateformat/dateformat_attr.c:134:36: error: use of undeclared identifier 'FALSE' - zend_bool is_pattern_localized =FALSE; - ^ -ext/intl/dateformat/dateformat_attr.c:230:25: error: use of undeclared identifier 'FALSE' - zend_bool isLenient = FALSE; - ^ -ext/intl/normalizer/normalizer_normalize.c:95:10: error: use of undeclared identifier 'FALSE' - return FALSE; - ^ -ext/intl/normalizer/normalizer_normalize.c:181:16: error: use of undeclared identifier 'FALSE' - UBool uret = FALSE; - ^ -ext/intl/timezone/timezone_class.cpp:324:21: error: use of undeclared identifier 'FALSE' - tz->getOffset(now, FALSE, rawOffset, dstOffset, uec); - ^ -ext/intl/timezone/timezone_methods.cpp:94:57: error: use of undeclared identifier 'FALSE' - tz = timezone_convert_datetimezone(tzobj->type, tzobj, FALSE, NULL, - ^ - ---- breakiterator/codepointiterator_internal.cpp.orig 2020-10-13 21:58:13 UTC -+++ breakiterator/codepointiterator_internal.cpp -@@ -56,7 +56,7 @@ CodePointBreakIterator& CodePointBreakIterator::operat - return *this; - } - -- this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec); -+ this->fText = utext_clone(this->fText, that.fText, false, true, &uec); - - //don't bother copying the character iterator, getText() is deprecated - clearCurrentCharIter(); -@@ -76,17 +76,17 @@ CodePointBreakIterator::~CodePointBreakIterator() - UBool CodePointBreakIterator::operator==(const BreakIterator& that) const - { - if (typeid(*this) != typeid(that)) { -- return FALSE; -+ return false; - } - - const CodePointBreakIterator& that2 = - static_cast(that); - - if (!utext_equals(this->fText, that2.fText)) { -- return FALSE; -+ return false; - } - -- return TRUE; -+ return true; - } - - CodePointBreakIterator* CodePointBreakIterator::clone(void) const -@@ -107,7 +107,7 @@ CharacterIterator& CodePointBreakIterator::getText(voi - - UText *CodePointBreakIterator::getUText(UText *fillIn, UErrorCode &status) const - { -- return utext_clone(fillIn, this->fText, FALSE, TRUE, &status); -+ return utext_clone(fillIn, this->fText, false, true, &status); - } - - void CodePointBreakIterator::setText(const UnicodeString &text) -@@ -126,7 +126,7 @@ void CodePointBreakIterator::setText(UText *text, UErr - return; - } - -- this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status); -+ this->fText = utext_clone(this->fText, text, false, true, &status); - - clearCurrentCharIter(); - } -@@ -278,7 +278,7 @@ CodePointBreakIterator &CodePointBreakIterator::refres - } - - int64_t pos = utext_getNativeIndex(this->fText); -- this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status); -+ this->fText = utext_clone(this->fText, input, false, true, &status); - if (U_FAILURE(status)) { - return *this; - } -Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 - -ext/intl/collator/collator_sort.c:349:26: error: use of undeclared identifier 'TRUE' - collator_sort_internal( TRUE, INTERNAL_FUNCTION_PARAM_PASSTHRU ); - ^ -ext/intl/collator/collator_sort.c:543:26: error: use of undeclared identifier 'FALSE' - collator_sort_internal( FALSE, INTERNAL_FUNCTION_PARAM_PASSTHRU ); - ^ - ---- collator/collator_sort.c.orig 2020-10-13 21:58:13 UTC -+++ collator/collator_sort.c -@@ -312,7 +312,7 @@ static void collator_sort_internal( int renumber, INTE - /* {{{ Sort array using specified collator. */ - PHP_FUNCTION( collator_sort ) - { -- collator_sort_internal( TRUE, INTERNAL_FUNCTION_PARAM_PASSTHRU ); -+ collator_sort_internal( true, INTERNAL_FUNCTION_PARAM_PASSTHRU ); - } - /* }}} */ - -@@ -495,7 +495,7 @@ PHP_FUNCTION( collator_sort_with_sort_keys ) - /* {{{ Sort array using specified collator, maintaining index association. */ - PHP_FUNCTION( collator_asort ) - { -- collator_sort_internal( FALSE, INTERNAL_FUNCTION_PARAM_PASSTHRU ); -+ collator_sort_internal( false, INTERNAL_FUNCTION_PARAM_PASSTHRU ); - } - /* }}} */ - ---- dateformat/dateformat_attr.c.orig 2020-10-13 21:58:13 UTC -+++ dateformat/dateformat_attr.c -@@ -69,7 +69,7 @@ PHP_FUNCTION( datefmt_get_pattern ) - UChar value_buf[64]; - uint32_t length = USIZE( value_buf ); - UChar* value = value_buf; -- zend_bool is_pattern_localized =FALSE; -+ zend_bool is_pattern_localized = false; - - DATE_FORMAT_METHOD_INIT_VARS; - -@@ -106,7 +106,7 @@ PHP_FUNCTION( datefmt_set_pattern ) - size_t value_len = 0; - int32_t slength = 0; - UChar* svalue = NULL; -- zend_bool is_pattern_localized =FALSE; -+ zend_bool is_pattern_localized = false; - - - DATE_FORMAT_METHOD_INIT_VARS; -@@ -184,7 +184,7 @@ PHP_FUNCTION( datefmt_is_lenient ) - /* {{{ Set formatter lenient. */ - PHP_FUNCTION( datefmt_set_lenient ) - { -- zend_bool isLenient = FALSE; -+ zend_bool isLenient = false; - - DATE_FORMAT_METHOD_INIT_VARS; - ---- normalizer/normalizer_normalize.c.orig 2020-10-13 21:58:13 UTC -+++ normalizer/normalizer_normalize.c -@@ -69,7 +69,7 @@ static UBool intl_is_normalized(zend_long form, const - const UNormalizer2 *norm = intl_get_normalizer(form, err); - - if(U_FAILURE(*err)) { -- return FALSE; -+ return false; - } - - return unorm2_isNormalized(norm, uinput, uinput_len, err); -@@ -226,7 +226,7 @@ PHP_FUNCTION( normalizer_is_normalized ) - int uinput_len = 0; - UErrorCode status = U_ZERO_ERROR; - -- UBool uret = FALSE; -+ UBool uret = false; - - intl_error_reset( NULL ); - ---- timezone/timezone_class.cpp.orig 2020-10-13 21:58:13 UTC -+++ timezone/timezone_class.cpp -@@ -327,7 +327,7 @@ static HashTable *TimeZone_get_debug_info(zend_object - - int32_t rawOffset, dstOffset; - UDate now = Calendar::getNow(); -- tz->getOffset(now, FALSE, rawOffset, dstOffset, uec); -+ tz->getOffset(now, false, rawOffset, dstOffset, uec); - if (U_FAILURE(uec)) { - return debug_info; - } ---- timezone/timezone_methods.cpp.orig 2020-10-13 21:58:13 UTC -+++ timezone/timezone_methods.cpp -@@ -89,7 +89,7 @@ U_CFUNC PHP_FUNCTION(intltz_from_date_time_zone) - RETURN_NULL(); - } - -- tz = timezone_convert_datetimezone(tzobj->type, tzobj, FALSE, NULL, -+ tz = timezone_convert_datetimezone(tzobj->type, tzobj, false, NULL, - "intltz_from_date_time_zone"); - if (tz == NULL) { - RETURN_NULL(); Property changes on: head/devel/php80-intl/files/patch-icu68 ___________________________________________________________________ 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: head/lang/php80/Makefile =================================================================== --- head/lang/php80/Makefile (revision 556078) +++ head/lang/php80/Makefile (revision 556079) @@ -1,189 +1,189 @@ # $FreeBSD$ PORTNAME= php80 -DISTVERSION= 8.0.0RC3 +DISTVERSION= 8.0.0RC5 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= https://downloads.php.net/~carusogabriel/ DISTNAME= php-${DISTVERSION} MAINTAINER= tz@FreeBSD.org COMMENT= PHP Scripting Language LICENSE= PHP301 USES+= compiler:c11 tar:xz cpe gnome pkgconfig 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 \ --with-libxml \ --with-password-argon2=${LOCALBASE} \ --program-prefix="" CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" 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 MYSQLND LINKTHR ZTS OPTIONS_DEFAULT=CLI CGI FPM EMBED MYSQLND 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_powerpc= DTRACE OPTIONS_EXCLUDE_powerpc64= DTRACE 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 MYSQLND_DESC= Build with MySQL Native Driver LINKTHR_DESC= Link thread lib (for threaded extensions) ZTS_DESC= Force Zend Thread Safety (ZTS) build CONFLICTS= php72-* php73-* php74-* DESTDIRNAME= INSTALL_ROOT .include .if ${PORT_OPTIONS:MMYSQLND} CONFIGURE_ARGS+=--enable-mysqlnd .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= libphp SHORTMODNAME= php8 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-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=80" > ${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=hash json 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: head/lang/php80/distinfo =================================================================== --- head/lang/php80/distinfo (revision 556078) +++ head/lang/php80/distinfo (revision 556079) @@ -1,3 +1,3 @@ -TIMESTAMP = 1604051937 -SHA256 (php-8.0.0RC3.tar.xz) = 3438b3adf87ee65ba7d90db189cabc0a0a42ffc39bb7ae93f65cf6080a68ebfa -SIZE (php-8.0.0RC3.tar.xz) = 10618712 +TIMESTAMP = 1605881259 +SHA256 (php-8.0.0RC5.tar.xz) = fa2e98d8b42e497a45f491c4714f0a67f7d817ff2f7ab9aad09efb72d2a8c60b +SIZE (php-8.0.0RC5.tar.xz) = 10628232